Add PayPal webhook handler and marketing styles
- Implemented PayPal webhook for handling payment notifications, including signature verification and transaction updates. - Created invoice generation and license management for software upgrades upon successful payment. - Added comprehensive logging for debugging purposes. - Introduced new CSS styles for the marketing file management system, including layout, toolbar, breadcrumb navigation, search filters, and file management UI components.
This commit is contained in:
116
api/v2/get/equipment_history.php
Normal file
116
api/v2/get/equipment_history.php
Normal file
@@ -0,0 +1,116 @@
|
||||
<?php
|
||||
defined($security_key) or exit;
|
||||
|
||||
// Database connection
|
||||
$pdo = dbConnect($dbname);
|
||||
|
||||
// ============================================
|
||||
// Input Validation & Sanitization
|
||||
// ============================================
|
||||
|
||||
$filters = [
|
||||
'serialnumber' => isset($_GET['serialnumber']) ? trim($_GET['serialnumber']) : null,
|
||||
'type' => isset($_GET['type']) ? trim($_GET['type']) : null,
|
||||
'start' => isset($_GET['start']) ? trim($_GET['start']) : date("Y-m-d", strtotime("-270 days")),
|
||||
'end' => isset($_GET['end']) ? trim($_GET['end']) : date("Y-m-d", strtotime("+1 days"))
|
||||
];
|
||||
|
||||
// ============================================
|
||||
// Build Query with Prepared Statements
|
||||
// ============================================
|
||||
|
||||
$whereClauses = [];
|
||||
$params = [];
|
||||
|
||||
// Serial Number Filter
|
||||
if ($filters['serialnumber']) {
|
||||
$whereClauses[] = 'h.description LIKE :serialnumber';
|
||||
$params[':serialnumber'] = "%historycreated%SN%:" . $filters['serialnumber'] . "%";
|
||||
$whereClauses[] = 'h.type != :excluded_type';
|
||||
$params[':excluded_type'] = 'SRIncluded';
|
||||
}
|
||||
|
||||
// Type Filter
|
||||
if ($filters['type']) {
|
||||
if ($filters['type'] === 'latest') {
|
||||
// Get only the latest record per equipment
|
||||
if ($filters['serialnumber']) {
|
||||
$whereClauses[] = 'h.rowID IN (
|
||||
SELECT MAX(h2.rowID)
|
||||
FROM equipment_history h2
|
||||
GROUP BY h2.equipmentid
|
||||
)';
|
||||
} else {
|
||||
$whereClauses[] = "h.description LIKE '%historycreated%'";
|
||||
$whereClauses[] = 'h.rowID IN (
|
||||
SELECT MAX(h2.rowID)
|
||||
FROM equipment_history h2
|
||||
WHERE h2.description LIKE :history_created
|
||||
GROUP BY h2.equipmentid
|
||||
)';
|
||||
$params[':history_created'] = '%historycreated%';
|
||||
}
|
||||
} else {
|
||||
// Specific type filter
|
||||
$whereClauses[] = 'h.type = :type';
|
||||
$params[':type'] = $filters['type'];
|
||||
}
|
||||
}
|
||||
|
||||
// Default filter if no other filters applied
|
||||
if (empty($whereClauses)) {
|
||||
$whereClauses[] = "h.description LIKE '%historycreated%'";
|
||||
}
|
||||
|
||||
// Date Range Filter
|
||||
$whereClauses[] = 'h.created BETWEEN :start_date AND :end_date';
|
||||
$params[':start_date'] = $filters['start'];
|
||||
$params[':end_date'] = $filters['end'];
|
||||
|
||||
// ============================================
|
||||
// Execute Query
|
||||
// ============================================
|
||||
|
||||
$whereClause = 'WHERE ' . implode(' AND ', $whereClauses);
|
||||
$sql = "SELECT h.rowID, h.description
|
||||
FROM equipment_history h
|
||||
$whereClause
|
||||
ORDER BY h.created DESC";
|
||||
|
||||
try {
|
||||
$stmt = $pdo->prepare($sql);
|
||||
$stmt->execute($params);
|
||||
$messages = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
// ============================================
|
||||
// Format Response
|
||||
// ============================================
|
||||
|
||||
$results = [];
|
||||
foreach ($messages as $message) {
|
||||
$record = json_decode($message['description'], true);
|
||||
|
||||
// Handle JSON decode errors
|
||||
if (json_last_error() !== JSON_ERROR_NONE) {
|
||||
continue; // Skip invalid JSON
|
||||
}
|
||||
|
||||
$record['historyID'] = (int)$message['rowID'];
|
||||
$results[] = $record;
|
||||
}
|
||||
|
||||
// Set proper headers
|
||||
header('Content-Type: application/json; charset=utf-8');
|
||||
echo json_encode($results, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE);
|
||||
|
||||
} catch (PDOException $e) {
|
||||
// Log error (don't expose to client in production)
|
||||
error_log("Database error: " . $e->getMessage());
|
||||
|
||||
//header('Content-Type: application/json; charset=utf-8', true, 500);
|
||||
echo json_encode([
|
||||
'error' => 'An error occurred while processing your request'
|
||||
]);
|
||||
}
|
||||
|
||||
?>
|
||||
@@ -275,7 +275,7 @@ else {
|
||||
}
|
||||
|
||||
//SQL for Paging
|
||||
$sql = 'SELECT e.rowID as equipmentID, e.*, p.productcode, p.productname, p.product_media from equipment e LEFT JOIN products p ON e.productrowid = p.rowID '.$whereclause.' ORDER BY '.$sort.' LIMIT :page,:num_products';
|
||||
$sql = 'SELECT e.rowID as equipmentID, e.*, p.productcode, p.productname, p.product_media, psl.starts_at,psl.expires_at,psl.status as license_status from equipment e LEFT JOIN products p ON e.productrowid = p.rowID LEFT JOIN products_software_licenses psl ON e.sw_version_license = psl.license_key '.$whereclause.' ORDER BY '.$sort.' LIMIT :page,:num_products';
|
||||
}
|
||||
|
||||
$stmt = $pdo->prepare($sql);
|
||||
|
||||
155
api/v2/get/marketing_files.php
Normal file
155
api/v2/get/marketing_files.php
Normal file
@@ -0,0 +1,155 @@
|
||||
<?php
|
||||
defined($security_key) or exit;
|
||||
|
||||
//------------------------------------------
|
||||
// Marketing Files
|
||||
//------------------------------------------
|
||||
|
||||
//Connect to DB
|
||||
$pdo = dbConnect($dbname);
|
||||
|
||||
//SoldTo is empty
|
||||
if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}
|
||||
|
||||
//default whereclause
|
||||
$whereclause = '';
|
||||
|
||||
// For testing, disable account hierarchy filtering
|
||||
// list($whereclause,$condition) = getWhereclauselvl2("",$permission,$partner,'get');
|
||||
|
||||
//NEW ARRAY
|
||||
$criterias = [];
|
||||
$clause = '';
|
||||
|
||||
//Check for $_GET variables and build up clause
|
||||
if(isset($get_content) && $get_content!=''){
|
||||
//GET VARIABLES FROM URL
|
||||
$requests = explode("&", $get_content);
|
||||
//Check for keys and values
|
||||
foreach ($requests as $y){
|
||||
$v = explode("=", $y);
|
||||
//INCLUDE VARIABLES IN ARRAY
|
||||
$criterias[$v[0]] = $v[1];
|
||||
|
||||
if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='totals' || $v[0] =='list' || $v[0] == 'action' || $v[0] =='success_msg' || $v[0] == '_t'){
|
||||
//do nothing
|
||||
}
|
||||
elseif ($v[0] == 'folder_id') {
|
||||
if ($v[1] === 'null' || $v[1] === '') {
|
||||
$clause .= ' AND folder_id IS NULL';
|
||||
} else {
|
||||
$clause .= ' AND folder_id = :folder_id';
|
||||
}
|
||||
}
|
||||
elseif ($v[0] == 'search') {
|
||||
$clause .= ' AND (title LIKE :search OR original_filename LIKE :search)';
|
||||
}
|
||||
elseif ($v[0] == 'tag') {
|
||||
$clause .= ' AND EXISTS (SELECT 1 FROM marketing_file_tags ft JOIN marketing_tags t ON ft.tag_id = t.id WHERE ft.file_id = mf.id AND t.tag_name = :tag)';
|
||||
}
|
||||
elseif ($v[0] == 'file_type') {
|
||||
$clause .= ' AND file_type = :file_type';
|
||||
}
|
||||
else {
|
||||
// Ignore unknown parameters
|
||||
}
|
||||
}
|
||||
if ($whereclause == '' && $clause !=''){
|
||||
$whereclause = 'WHERE '.substr($clause, 4);
|
||||
} else {
|
||||
$whereclause .= $clause;
|
||||
}
|
||||
}
|
||||
|
||||
//Set page
|
||||
$pagina = 1;
|
||||
if(isset($criterias['p']) && $criterias['p'] !='') {
|
||||
$pagina = $criterias['p'];
|
||||
}
|
||||
|
||||
//Set limit
|
||||
$limit = 50;
|
||||
if(isset($criterias['limit']) && $criterias['limit'] !='') {
|
||||
$limit = intval($criterias['limit']);
|
||||
}
|
||||
$offset = ($pagina - 1) * $limit;
|
||||
|
||||
//check for totals call
|
||||
if(isset($criterias['totals'])){
|
||||
$sql = 'SELECT COUNT(*) as found FROM marketing_files mf '.$whereclause.' ';
|
||||
$stmt = $pdo->prepare($sql);
|
||||
|
||||
// Bind parameters
|
||||
if (!empty($criterias)) {
|
||||
foreach ($criterias as $key => $value) {
|
||||
if ($key !== 'totals' && $key !== 'page' && $key !== 'p' && $key !== 'limit' && $key !== 'action') {
|
||||
if ($key == 'search') {
|
||||
$stmt->bindValue(':'.$key, '%'.$value.'%');
|
||||
} elseif ($key == 'folder_id' && ($value === 'null' || $value === '')) {
|
||||
continue;
|
||||
} else {
|
||||
$stmt->bindValue(':'.$key, $value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$stmt->execute();
|
||||
$found = $stmt->fetchColumn();
|
||||
echo $found;
|
||||
exit;
|
||||
}
|
||||
|
||||
// Main query
|
||||
$sql = "SELECT
|
||||
mf.*,
|
||||
GROUP_CONCAT(mt.tag_name) as tags
|
||||
FROM marketing_files mf
|
||||
LEFT JOIN marketing_file_tags mft ON mf.id = mft.file_id
|
||||
LEFT JOIN marketing_tags mt ON mft.tag_id = mt.id
|
||||
" . $whereclause . "
|
||||
GROUP BY mf.id
|
||||
ORDER BY mf.created DESC
|
||||
LIMIT " . $limit . " OFFSET " . $offset;
|
||||
|
||||
$stmt = $pdo->prepare($sql);
|
||||
|
||||
// Bind parameters
|
||||
if (!empty($criterias)) {
|
||||
foreach ($criterias as $key => $value) {
|
||||
if ($key !== 'totals' && $key !== 'page' && $key !== 'p' && $key !== 'limit') {
|
||||
if ($key == 'search') {
|
||||
$stmt->bindValue(':'.$key, '%'.$value.'%');
|
||||
} elseif ($key == 'folder_id' && ($value === 'null' || $value === '')) {
|
||||
continue;
|
||||
} else {
|
||||
$stmt->bindValue(':'.$key, $value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$stmt->execute();
|
||||
$marketing_files = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
// Process each file
|
||||
foreach ($marketing_files as &$file) {
|
||||
// Process tags
|
||||
$file['tags'] = $file['tags'] ? explode(',', $file['tags']) : [];
|
||||
|
||||
// Format file size
|
||||
$bytes = $file['file_size'];
|
||||
if ($bytes >= 1073741824) {
|
||||
$file['file_size_formatted'] = number_format($bytes / 1073741824, 2) . ' GB';
|
||||
} elseif ($bytes >= 1048576) {
|
||||
$file['file_size_formatted'] = number_format($bytes / 1048576, 2) . ' MB';
|
||||
} elseif ($bytes >= 1024) {
|
||||
$file['file_size_formatted'] = number_format($bytes / 1024, 2) . ' KB';
|
||||
} else {
|
||||
$file['file_size_formatted'] = $bytes . ' B';
|
||||
}
|
||||
}
|
||||
|
||||
// Return result
|
||||
echo json_encode($marketing_files, JSON_UNESCAPED_UNICODE);
|
||||
exit;
|
||||
172
api/v2/get/marketing_folders.php
Normal file
172
api/v2/get/marketing_folders.php
Normal file
@@ -0,0 +1,172 @@
|
||||
<?php
|
||||
defined($security_key) or exit;
|
||||
ini_set('display_errors', '1');
|
||||
ini_set('display_startup_errors', '1');
|
||||
error_reporting(E_ALL);
|
||||
//------------------------------------------
|
||||
// Marketing Folders
|
||||
//------------------------------------------
|
||||
|
||||
//Connect to DB
|
||||
$pdo = dbConnect($dbname);
|
||||
|
||||
// Function to build hierarchical tree structure
|
||||
function buildFolderTree($folders, $parentId = null) {
|
||||
$tree = [];
|
||||
|
||||
foreach ($folders as $folder) {
|
||||
if ($folder['parent_id'] == $parentId) {
|
||||
$children = buildFolderTree($folders, $folder['id']);
|
||||
$folder['children'] = $children; // Always include children array, even if empty
|
||||
$tree[] = $folder;
|
||||
}
|
||||
}
|
||||
|
||||
return $tree;
|
||||
}
|
||||
|
||||
//SoldTo is empty
|
||||
if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}
|
||||
|
||||
//default whereclause
|
||||
$whereclause = '';
|
||||
|
||||
list($whereclause,$condition) = getWhereclauselvl2('',$permission,$partner,'get');
|
||||
|
||||
//NEW ARRAY
|
||||
$criterias = [];
|
||||
$clause = '';
|
||||
|
||||
//Check for $_GET variables and build up clause
|
||||
if(isset($get_content) && $get_content!=''){
|
||||
//GET VARIABLES FROM URL
|
||||
$requests = explode("&", $get_content);
|
||||
//Check for keys and values
|
||||
foreach ($requests as $y){
|
||||
$v = explode("=", $y);
|
||||
//INCLUDE VARIABLES IN ARRAY
|
||||
$criterias[$v[0]] = $v[1];
|
||||
|
||||
if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='totals' || $v[0] =='list' || $v[0] =='success_msg' || $v[0] == 'action' || $v[0] == 'tree'){
|
||||
//do nothing - these are not SQL parameters
|
||||
}
|
||||
elseif ($v[0] == 'parent_id') {
|
||||
if ($v[1] === 'null' || $v[1] === '') {
|
||||
$clause .= ' AND parent_id IS NULL';
|
||||
} else {
|
||||
$clause .= ' AND parent_id = :parent_id';
|
||||
}
|
||||
}
|
||||
elseif ($v[0] == 'search') {
|
||||
$clause .= ' AND (folder_name LIKE :search OR description LIKE :search)';
|
||||
}
|
||||
else {//create clause
|
||||
$clause .= ' AND '.$v[0].' = :'.$v[0];
|
||||
}
|
||||
}
|
||||
if ($whereclause == '' && $clause !=''){
|
||||
$whereclause = 'WHERE '.substr($clause, 4);
|
||||
} else {
|
||||
$whereclause .= $clause;
|
||||
}
|
||||
}
|
||||
|
||||
//Define Query
|
||||
if(isset($criterias['totals']) && $criterias['totals'] ==''){
|
||||
//Request for total rows
|
||||
$sql = 'SELECT count(*) as count FROM marketing_folders '.$whereclause.'';
|
||||
}
|
||||
elseif (isset($criterias['list']) && $criterias['list'] =='') {
|
||||
//SQL for list (no paging)
|
||||
$sql = "SELECT
|
||||
mf.*,
|
||||
(SELECT COUNT(*) FROM marketing_files WHERE folder_id = mf.id) as file_count,
|
||||
(SELECT COUNT(*) FROM marketing_folders WHERE parent_id = mf.id) as subfolder_count,
|
||||
CASE
|
||||
WHEN mf.parent_id IS NOT NULL THEN
|
||||
(SELECT folder_name FROM marketing_folders WHERE id = mf.parent_id)
|
||||
ELSE NULL
|
||||
END as parent_folder_name
|
||||
FROM marketing_folders mf
|
||||
" . $whereclause . "
|
||||
ORDER BY mf.folder_name ASC";
|
||||
}
|
||||
else {
|
||||
//SQL for paging
|
||||
$sql = "SELECT
|
||||
mf.*,
|
||||
(SELECT COUNT(*) FROM marketing_files WHERE folder_id = mf.id) as file_count,
|
||||
(SELECT COUNT(*) FROM marketing_folders WHERE parent_id = mf.id) as subfolder_count,
|
||||
CASE
|
||||
WHEN mf.parent_id IS NOT NULL THEN
|
||||
(SELECT folder_name FROM marketing_folders WHERE id = mf.parent_id)
|
||||
ELSE NULL
|
||||
END as parent_folder_name
|
||||
FROM marketing_folders mf
|
||||
" . $whereclause . "
|
||||
ORDER BY mf.folder_name ASC
|
||||
LIMIT :page,:num_folders";
|
||||
}
|
||||
|
||||
$stmt = $pdo->prepare($sql);
|
||||
|
||||
//Bind to query
|
||||
if (str_contains($whereclause, ':condition')){
|
||||
$stmt->bindValue('condition', $condition, PDO::PARAM_STR);
|
||||
}
|
||||
|
||||
if (!empty($criterias)){
|
||||
foreach ($criterias as $key => $value){
|
||||
$key_condition = ':'.$key;
|
||||
if (str_contains($whereclause, $key_condition)){
|
||||
if ($key == 'search'){
|
||||
$search_value = '%'.$value.'%';
|
||||
$stmt->bindValue($key, $search_value, PDO::PARAM_STR);
|
||||
}
|
||||
elseif ($key == 'parent_id' && ($value === 'null' || $value === '')) {
|
||||
// Skip binding for NULL parent_id
|
||||
continue;
|
||||
}
|
||||
else {
|
||||
$stmt->bindValue($key, $value, PDO::PARAM_STR);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Add paging details
|
||||
if(isset($criterias['totals']) && $criterias['totals']==''){
|
||||
$stmt->execute();
|
||||
$messages = $stmt->fetch();
|
||||
$messages = $messages[0];
|
||||
}
|
||||
elseif(isset($criterias['list']) && $criterias['list']==''){
|
||||
//Execute Query
|
||||
$stmt->execute();
|
||||
//Get results
|
||||
$messages = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
}
|
||||
else {
|
||||
$current_page = isset($criterias['p']) && is_numeric($criterias['p']) ? (int)$criterias['p'] : 1;
|
||||
$stmt->bindValue('page', ($current_page - 1) * $page_rows_folders, PDO::PARAM_INT);
|
||||
$stmt->bindValue('num_folders', $page_rows_folders, PDO::PARAM_INT);
|
||||
|
||||
//Execute Query
|
||||
$stmt->execute();
|
||||
//Get results
|
||||
$messages = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
}
|
||||
|
||||
// Check if tree structure is requested
|
||||
if (isset($criterias['tree']) && isset($messages) && is_array($messages)) {
|
||||
// Build hierarchical tree structure
|
||||
$messages = buildFolderTree($messages);
|
||||
}
|
||||
|
||||
//------------------------------------------
|
||||
//JSON_ENCODE
|
||||
//------------------------------------------
|
||||
$messages = json_encode($messages, JSON_UNESCAPED_UNICODE);
|
||||
|
||||
//Send results
|
||||
echo $messages;
|
||||
115
api/v2/get/marketing_tags.php
Normal file
115
api/v2/get/marketing_tags.php
Normal file
@@ -0,0 +1,115 @@
|
||||
<?php
|
||||
defined($security_key) or exit;
|
||||
|
||||
//------------------------------------------
|
||||
// Marketing Tags
|
||||
//------------------------------------------
|
||||
|
||||
//Connect to DB
|
||||
$pdo = dbConnect($dbname);
|
||||
|
||||
//SoldTo is empty
|
||||
if (empty($partner->soldto) || $partner->soldto == ''){$soldto_search = '%';} else {$soldto_search = '-%';}
|
||||
|
||||
//default whereclause
|
||||
$whereclause = '';
|
||||
|
||||
// Tags are global, so no account hierarchy filtering
|
||||
// list($whereclause,$condition) = getWhereclauselvl2("",$permission,$partner,'get');
|
||||
|
||||
//NEW ARRAY
|
||||
$criterias = [];
|
||||
$clause = '';
|
||||
|
||||
//Check for $_GET variables and build up clause
|
||||
if(isset($get_content) && $get_content!=''){
|
||||
//GET VARIABLES FROM URL
|
||||
$requests = explode("&", $get_content);
|
||||
//Check for keys and values
|
||||
foreach ($requests as $y){
|
||||
$v = explode("=", $y);
|
||||
//INCLUDE VARIABLES IN ARRAY
|
||||
$criterias[$v[0]] = $v[1];
|
||||
|
||||
if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='totals' || $v[0] =='list' || $v[0] =='success_msg' || $v[0] == 'action'){
|
||||
//do nothing
|
||||
}
|
||||
elseif ($v[0] == 'search') {
|
||||
$clause .= ' AND tag_name LIKE :search';
|
||||
}
|
||||
elseif ($v[0] == 'used_only') {
|
||||
if ($v[1] === 'true') {
|
||||
$clause .= ' AND id IN (SELECT DISTINCT tag_id FROM marketing_file_tags)';
|
||||
}
|
||||
}
|
||||
else {//create clause
|
||||
$clause .= ' AND '.$v[0].' = :'.$v[0];
|
||||
}
|
||||
}
|
||||
if ($whereclause == '' && $clause !=''){
|
||||
$whereclause = 'WHERE '.substr($clause, 4);
|
||||
} else {
|
||||
$whereclause .= $clause;
|
||||
}
|
||||
}
|
||||
|
||||
//Set page
|
||||
$pagina = 1;
|
||||
if(isset($criterias['p']) && $criterias['p'] !='') {
|
||||
$pagina = $criterias['p'];
|
||||
}
|
||||
|
||||
//check for totals call
|
||||
if(isset($criterias['totals'])){
|
||||
$sql = 'SELECT COUNT(*) as found FROM marketing_tags mt '.$whereclause.' ';
|
||||
$stmt = $pdo->prepare($sql);
|
||||
|
||||
// Bind parameters
|
||||
if (!empty($criterias)) {
|
||||
foreach ($criterias as $key => $value) {
|
||||
if ($key !== 'totals' && $key !== 'page' && $key !== 'p' && $key !== 'used_only') {
|
||||
if ($key == 'search') {
|
||||
$stmt->bindValue(':'.$key, '%'.$value.'%');
|
||||
} else {
|
||||
$stmt->bindValue(':'.$key, $value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$stmt->execute();
|
||||
$found = $stmt->fetchColumn();
|
||||
echo $found;
|
||||
exit;
|
||||
}
|
||||
|
||||
// Main query
|
||||
$sql = "SELECT
|
||||
mt.*,
|
||||
COUNT(mft.file_id) as usage_count
|
||||
FROM marketing_tags mt
|
||||
LEFT JOIN marketing_file_tags mft ON mt.id = mft.tag_id
|
||||
" . $whereclause . "
|
||||
GROUP BY mt.id
|
||||
ORDER BY mt.tag_name ASC";
|
||||
|
||||
$stmt = $pdo->prepare($sql);
|
||||
|
||||
// Bind parameters
|
||||
if (!empty($criterias)) {
|
||||
foreach ($criterias as $key => $value) {
|
||||
if ($key !== 'totals' && $key !== 'page' && $key !== 'p' && $key !== 'used_only') {
|
||||
if ($key == 'search') {
|
||||
$stmt->bindValue(':'.$key, '%'.$value.'%');
|
||||
} else {
|
||||
$stmt->bindValue(':'.$key, $value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$stmt->execute();
|
||||
$marketing_tags = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
// Return result
|
||||
echo json_encode($marketing_tags, JSON_UNESCAPED_UNICODE);
|
||||
41
api/v2/get/service.php
Normal file
41
api/v2/get/service.php
Normal file
@@ -0,0 +1,41 @@
|
||||
<?php
|
||||
defined($security_key) or exit;
|
||||
|
||||
//------------------------------------------
|
||||
// Application related calls
|
||||
//------------------------------------------
|
||||
$request = explode('/', trim($_SERVER['PATH_INFO'],'/'));
|
||||
$action = $request[2] ?? '';
|
||||
|
||||
|
||||
if ($action == 'init'){
|
||||
include './settings/systemservicetool_init.php';
|
||||
echo json_encode($init);
|
||||
}
|
||||
elseif ($action == 'questions' && (isset($_GET['type']) && $_GET['type'] != '')){
|
||||
|
||||
include './settings/systemservicetool.php';
|
||||
|
||||
//build questions
|
||||
switch ($_GET['type']) {
|
||||
case 'visual':
|
||||
$arrayQuestions = $arrayQuestions_visual;
|
||||
break;
|
||||
|
||||
case 'final':
|
||||
$arrayQuestions = $arrayQuestions_finalize;
|
||||
break;
|
||||
|
||||
case 'cartest':
|
||||
include './settings/systemcartest.php';
|
||||
$arrayQuestions = $arrayQuestions_cartest;
|
||||
break;
|
||||
}
|
||||
//Return JSON
|
||||
echo json_encode($arrayQuestions);
|
||||
}
|
||||
else {
|
||||
http_response_code(400);
|
||||
}
|
||||
|
||||
?>
|
||||
@@ -62,6 +62,7 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
|
||||
e.sw_version as current_sw_version,
|
||||
e.hw_version,
|
||||
e.sw_version_license,
|
||||
e.sw_version_upgrade,
|
||||
e.rowID as equipment_rowid
|
||||
FROM equipment e
|
||||
JOIN products p ON e.productrowid = p.rowID
|
||||
@@ -78,6 +79,7 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
|
||||
$current_sw_version = $equipment_data['current_sw_version'];
|
||||
$hw_version = $equipment_data['hw_version'];
|
||||
$sw_version_license = $equipment_data['sw_version_license'];
|
||||
$sw_version_upgrade = $equipment_data['sw_version_upgrade'];
|
||||
$equipment_rowid = $equipment_data['equipment_rowid'];
|
||||
|
||||
if (debug) {
|
||||
@@ -85,7 +87,8 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
|
||||
'product_rowid' => $product_rowid,
|
||||
'productcode' => $productcode,
|
||||
'current_sw_version_raw' => $current_sw_version,
|
||||
'hw_version' => $hw_version
|
||||
'hw_version' => $hw_version,
|
||||
'sw_version_upgrade' => $sw_version_upgrade
|
||||
];
|
||||
}
|
||||
|
||||
@@ -119,6 +122,77 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
|
||||
exit;
|
||||
}
|
||||
|
||||
// Check if sw_version_upgrade is set - this overrides normal availability check
|
||||
if (!empty($sw_version_upgrade)) {
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check'] = [
|
||||
'sw_version_upgrade_id' => $sw_version_upgrade,
|
||||
'checking_override' => true
|
||||
];
|
||||
}
|
||||
|
||||
// Check if this version exists and is active
|
||||
$sql = 'SELECT
|
||||
psv.rowID as version_id,
|
||||
psv.version,
|
||||
psv.name,
|
||||
psv.description,
|
||||
psv.mandatory,
|
||||
psv.latest,
|
||||
psv.hw_version,
|
||||
psv.file_path,
|
||||
psv.status
|
||||
FROM products_software_versions psv
|
||||
WHERE psv.rowID = ?';
|
||||
$stmt = $pdo->prepare($sql);
|
||||
$stmt->execute([$sw_version_upgrade]);
|
||||
$upgrade_version = $stmt->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
if ($upgrade_version && $upgrade_version['status'] == 1) {
|
||||
// Valid override found - check if different from current version
|
||||
$normalized_upgrade_version = strtolower(ltrim($upgrade_version['version'], '0'));
|
||||
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check']['found_version'] = [
|
||||
'version' => $upgrade_version['version'],
|
||||
'name' => $upgrade_version['name'],
|
||||
'normalized' => $normalized_upgrade_version,
|
||||
'status' => $upgrade_version['status'],
|
||||
'is_different_from_current' => ($current_sw_version != $normalized_upgrade_version)
|
||||
];
|
||||
}
|
||||
|
||||
if ($current_sw_version && $normalized_upgrade_version == $current_sw_version) {
|
||||
// Override version is same as current - no upgrade available
|
||||
$software_available = "no";
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check']['decision'] = 'Override version is same as current version';
|
||||
}
|
||||
} else {
|
||||
// Override version is different - upgrade is available
|
||||
$software_available = "yes";
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check']['decision'] = 'Override version is available';
|
||||
}
|
||||
}
|
||||
|
||||
$messages = ["software_available" => $software_available];
|
||||
|
||||
if (debug) {
|
||||
debuglog(json_encode($debug));
|
||||
}
|
||||
|
||||
echo json_encode($messages, JSON_UNESCAPED_UNICODE);
|
||||
exit;
|
||||
} else {
|
||||
// Override version not found or inactive - fall back to standard check
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check']['found_version'] = $upgrade_version ? 'found but inactive' : 'not found';
|
||||
$debug['sw_version_upgrade_check']['decision'] = 'Falling back to standard check';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//GET ALL ACTIVE SOFTWARE ASSIGNMENTS for this product with matching HW version
|
||||
$sql = 'SELECT
|
||||
psv.rowID as version_id,
|
||||
|
||||
@@ -61,6 +61,7 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
|
||||
e.sw_version as current_sw_version,
|
||||
e.hw_version,
|
||||
e.sw_version_license,
|
||||
e.sw_version_upgrade,
|
||||
e.rowID as equipment_rowid
|
||||
FROM equipment e
|
||||
JOIN products p ON e.productrowid = p.rowID
|
||||
@@ -77,6 +78,7 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
|
||||
$current_sw_version = $equipment_data['current_sw_version'];
|
||||
$hw_version = $equipment_data['hw_version'];
|
||||
$sw_version_license = $equipment_data['sw_version_license'];
|
||||
$sw_version_upgrade = $equipment_data['sw_version_upgrade'];
|
||||
$equipment_rowid = $equipment_data['equipment_rowid'];
|
||||
|
||||
if (debug) {
|
||||
@@ -85,7 +87,8 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
|
||||
'productcode' => $productcode,
|
||||
'current_sw_version_raw' => $current_sw_version,
|
||||
'hw_version' => $hw_version,
|
||||
'sw_version_license' => $sw_version_license
|
||||
'sw_version_license' => $sw_version_license,
|
||||
'sw_version_upgrade' => $sw_version_upgrade
|
||||
];
|
||||
}
|
||||
|
||||
@@ -119,6 +122,95 @@ if (isset($criterias['sn']) && $criterias['sn'] != ''){
|
||||
exit;
|
||||
}
|
||||
|
||||
// Check if sw_version_upgrade is set - this overrides normal availability check
|
||||
if (!empty($sw_version_upgrade)) {
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check'] = [
|
||||
'sw_version_upgrade_id' => $sw_version_upgrade,
|
||||
'checking_override' => true
|
||||
];
|
||||
}
|
||||
|
||||
// Check if this version exists and is active
|
||||
$sql = 'SELECT
|
||||
psv.rowID as version_id,
|
||||
psv.version,
|
||||
psv.name,
|
||||
psv.description,
|
||||
psv.mandatory,
|
||||
psv.latest,
|
||||
psv.hw_version,
|
||||
psv.file_path,
|
||||
psv.status
|
||||
FROM products_software_versions psv
|
||||
WHERE psv.rowID = ?';
|
||||
$stmt = $pdo->prepare($sql);
|
||||
$stmt->execute([$sw_version_upgrade]);
|
||||
$upgrade_version = $stmt->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
if ($upgrade_version && $upgrade_version['status'] == 1) {
|
||||
// Valid override found - check if different from current version
|
||||
$normalized_upgrade_version = strtolower(ltrim($upgrade_version['version'], '0'));
|
||||
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check']['found_version'] = [
|
||||
'version' => $upgrade_version['version'],
|
||||
'name' => $upgrade_version['name'],
|
||||
'normalized' => $normalized_upgrade_version,
|
||||
'status' => $upgrade_version['status'],
|
||||
'is_different_from_current' => ($current_sw_version != $normalized_upgrade_version)
|
||||
];
|
||||
}
|
||||
|
||||
if (!$current_sw_version || $current_sw_version == '' || $normalized_upgrade_version != $current_sw_version) {
|
||||
// Override version is different from current (or no current) - return only this upgrade
|
||||
$output[] = [
|
||||
"productcode" => $productcode,
|
||||
"name" => $upgrade_version['name'] ?? '',
|
||||
"version" => $upgrade_version['version'],
|
||||
"version_id" => $upgrade_version['version_id'],
|
||||
"description" => $upgrade_version['description'] ?? '',
|
||||
"hw_version" => $upgrade_version['hw_version'] ?? '',
|
||||
"mandatory" => $upgrade_version['mandatory'] ?? '',
|
||||
"latest" => $upgrade_version['latest'] ?? '',
|
||||
"software" => $upgrade_version['file_path'] ?? '',
|
||||
"source" => '',
|
||||
"source_type" => '',
|
||||
"price" => '0.00',
|
||||
"currency" => '',
|
||||
"is_current" => false
|
||||
];
|
||||
|
||||
// Generate download token
|
||||
$download_token = create_download_url_token($criterias['sn'], $upgrade_version['version_id']);
|
||||
$download_url = 'https://'.$_SERVER['SERVER_NAME'].'/api.php/v2/software_download?token='.$download_token;
|
||||
$output[0]['source'] = $download_url;
|
||||
$output[0]['source_type'] = 'token_url';
|
||||
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check']['decision'] = 'Override version returned as only upgrade';
|
||||
$output[0]['_debug'] = $debug;
|
||||
}
|
||||
} else {
|
||||
// Override version is same as current - no upgrades
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check']['decision'] = 'Override version is same as current version - no upgrades';
|
||||
$output = ['message' => 'No upgrades available', 'debug' => $debug];
|
||||
}
|
||||
}
|
||||
|
||||
$messages = $output;
|
||||
echo json_encode($messages, JSON_UNESCAPED_UNICODE);
|
||||
exit;
|
||||
} else {
|
||||
// Override version not found or inactive - fall back to standard check
|
||||
if (debug) {
|
||||
$debug['sw_version_upgrade_check']['found_version'] = $upgrade_version ? 'found but inactive' : 'not found';
|
||||
$debug['sw_version_upgrade_check']['decision'] = 'Falling back to standard check';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//GET ALL ACTIVE SOFTWARE ASSIGNMENTS for this product with matching HW version
|
||||
$sql = 'SELECT
|
||||
psv.rowID as version_id,
|
||||
|
||||
Reference in New Issue
Block a user