Refactor API endpoints and update invoice generation
- Updated API calls in equipment.php, equipment_manage.php, and equipments_mass_update.php to use v2 endpoints. - Changed payload decoding from decode_payload to json_decode for consistency. - Enhanced invoice generation in factuur.php and webhook files to use a new email template and PDF structure. - Added new email and PDF templates for invoices to improve formatting and readability. - Improved marketing folder handling in marketing.php with better payload management. - Updated CSS for marketing to enhance UI interactions. - Added JavaScript checks for browser compatibility in softwaretool.php. - Adjusted user permissions in settingsprofiles.php to reflect new features.
This commit is contained in:
“VeLiTi”
@@ -19,9 +19,6 @@ if (isAllowed('marketing',$profile,$permission,'U') === 1){
|
||||
$input = json_decode(file_get_contents('php://input'), true);
|
||||
|
||||
$file_id = $input['file_id'] ?? '';
|
||||
$folder_id = $input['folder_id'] ?? '';
|
||||
$tags = $input['tags'] ?? [];
|
||||
$title = $input['title'] ?? '';
|
||||
|
||||
if (empty($file_id)) {
|
||||
echo json_encode(['success' => false, 'error' => 'File ID is required']);
|
||||
@@ -29,35 +26,61 @@ if (isAllowed('marketing',$profile,$permission,'U') === 1){
|
||||
}
|
||||
|
||||
try {
|
||||
// Update file
|
||||
$update_sql = 'UPDATE `marketing_files` SET `title` = ?, `folder_id` = ? WHERE `id` = ? AND `accounthierarchy` LIKE ?';
|
||||
$stmt = $pdo->prepare($update_sql);
|
||||
$stmt->execute([
|
||||
$title,
|
||||
$folder_id ?: null,
|
||||
$file_id,
|
||||
$condition
|
||||
]);
|
||||
|
||||
if ($stmt->rowCount() === 0) {
|
||||
// First verify the file exists and user has access
|
||||
$check_sql = 'SELECT id FROM `marketing_files` WHERE `id` = ?';
|
||||
$check_stmt = $pdo->prepare($check_sql);
|
||||
$check_stmt->execute([$file_id]);
|
||||
|
||||
if ($check_stmt->rowCount() === 0) {
|
||||
echo json_encode(['success' => false, 'error' => 'File not found or access denied']);
|
||||
exit;
|
||||
}
|
||||
|
||||
// Update tags - first remove existing
|
||||
$pdo->prepare('DELETE FROM `marketing_file_tags` WHERE `file_id` = ?')->execute([$file_id]);
|
||||
// Build dynamic UPDATE query for only changed fields
|
||||
$update_fields = [];
|
||||
$update_params = [];
|
||||
|
||||
if (isset($input['title'])) {
|
||||
$update_fields[] = '`title` = ?';
|
||||
$update_params[] = $input['title'];
|
||||
}
|
||||
|
||||
if (isset($input['folder_id'])) {
|
||||
$update_fields[] = '`folder_id` = ?';
|
||||
$update_params[] = $input['folder_id'] ?: null;
|
||||
}
|
||||
|
||||
// Always update updatedby if there are changes
|
||||
if (!empty($update_fields)) {
|
||||
$update_fields[] = '`updatedby` = ?';
|
||||
$update_params[] = $username;
|
||||
$update_params[] = $file_id;
|
||||
|
||||
$update_sql = 'UPDATE `marketing_files` SET ' . implode(', ', $update_fields) . ' WHERE `id` = ?';
|
||||
$stmt = $pdo->prepare($update_sql);
|
||||
$stmt->execute($update_params);
|
||||
}
|
||||
|
||||
// Insert new tags
|
||||
if (!empty($tags)) {
|
||||
$tag_sql = 'INSERT IGNORE INTO `marketing_tags` (`tag_name`) VALUES (?)';
|
||||
$tag_stmt = $pdo->prepare($tag_sql);
|
||||
// Update tags only if provided
|
||||
if (isset($input['tags'])) {
|
||||
// Remove existing tags
|
||||
$pdo->prepare('DELETE FROM `marketing_file_tags` WHERE `file_id` = ?')->execute([$file_id]);
|
||||
|
||||
// Parse and insert new tags
|
||||
$tags_string = $input['tags'];
|
||||
$tags_array = array_filter(array_map('trim', explode(',', $tags_string)));
|
||||
|
||||
$file_tag_sql = 'INSERT INTO `marketing_file_tags` (`file_id`, `tag_id`) SELECT ?, id FROM marketing_tags WHERE tag_name = ?';
|
||||
$file_tag_stmt = $pdo->prepare($file_tag_sql);
|
||||
|
||||
foreach ($tags as $tag) {
|
||||
$tag_stmt->execute([trim($tag)]);
|
||||
$file_tag_stmt->execute([$file_id, trim($tag)]);
|
||||
if (!empty($tags_array)) {
|
||||
$tag_sql = 'INSERT IGNORE INTO `marketing_tags` (`tag_name`) VALUES (?)';
|
||||
$tag_stmt = $pdo->prepare($tag_sql);
|
||||
|
||||
$file_tag_sql = 'INSERT INTO `marketing_file_tags` (`file_id`, `tag_id`) SELECT ?, id FROM marketing_tags WHERE tag_name = ?';
|
||||
$file_tag_stmt = $pdo->prepare($file_tag_sql);
|
||||
|
||||
foreach ($tags_array as $tag) {
|
||||
$tag_stmt->execute([$tag]);
|
||||
$file_tag_stmt->execute([$file_id, $tag]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -53,8 +53,8 @@ if (isAllowed('marketing',$profile,$permission,'C') === 1){
|
||||
}
|
||||
|
||||
// Non-images must be under 10MB
|
||||
if (!$isImage && $file['size'] > 10000000) {
|
||||
echo json_encode(['success' => false, 'error' => 'File too large. Maximum size is 10MB.']);
|
||||
if (!$isImage && $file['size'] > 25000000) {
|
||||
echo json_encode(['success' => false, 'error' => 'File too large. Maximum size is 25MB.']);
|
||||
exit;
|
||||
}
|
||||
|
||||
@@ -70,19 +70,28 @@ if (isAllowed('marketing',$profile,$permission,'C') === 1){
|
||||
}
|
||||
|
||||
if (move_uploaded_file($file['tmp_name'], $target_file)) {
|
||||
// Generate thumbnail for images
|
||||
// Generate thumbnail
|
||||
$thumbnail_path = null;
|
||||
$thumb_dir = $target_dir . "thumbs/";
|
||||
if (!file_exists($thumb_dir)) {
|
||||
mkdir($thumb_dir, 0755, true);
|
||||
}
|
||||
|
||||
// Generate thumbnail for images
|
||||
if (in_array($ext, ['jpg', 'jpeg', 'png', 'gif', 'webp'])) {
|
||||
$thumb_dir = $target_dir . "thumbs/";
|
||||
if (!file_exists($thumb_dir)) {
|
||||
mkdir($thumb_dir, 0755, true);
|
||||
}
|
||||
|
||||
$thumbnail_file = $thumb_dir . $unique_filename;
|
||||
if (generateThumbnail($target_file, $thumbnail_file, 200, 200)) {
|
||||
$thumbnail_path = "marketing/uploads/thumbs/" . $unique_filename;
|
||||
}
|
||||
}
|
||||
// Generate thumbnail for videos
|
||||
elseif (in_array($ext, ['mp4', 'mov', 'avi'])) {
|
||||
$thumbnail_filename = pathinfo($unique_filename, PATHINFO_FILENAME) . '.jpg';
|
||||
$thumbnail_file = $thumb_dir . $thumbnail_filename;
|
||||
if (generateVideoThumbnail($target_file, $thumbnail_file)) {
|
||||
$thumbnail_path = "marketing/uploads/thumbs/" . $thumbnail_filename;
|
||||
}
|
||||
}
|
||||
|
||||
// Insert into database
|
||||
$insert_sql = 'INSERT INTO `marketing_files` (`title`, `original_filename`, `file_path`, `thumbnail_path`, `file_type`, `file_size`, `folder_id`, `tags`, `createdby`, `accounthierarchy`) VALUES (?,?,?,?,?,?,?,?,?,?)';
|
||||
@@ -299,4 +308,29 @@ function generateThumbnail($source, $destination, $width, $height) {
|
||||
return $result;
|
||||
}
|
||||
|
||||
// Function to generate video thumbnail
|
||||
function generateVideoThumbnail($source, $destination) {
|
||||
// Check if ffmpeg is available
|
||||
$ffmpeg = trim(shell_exec('which ffmpeg 2>/dev/null'));
|
||||
if (empty($ffmpeg)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Generate thumbnail from video at 1 second mark
|
||||
// -i: input file
|
||||
// -ss: seek to 1 second
|
||||
// -vframes 1: extract one frame
|
||||
// -vf: scale to 200x200 maintaining aspect ratio
|
||||
$command = sprintf(
|
||||
'%s -i %s -ss 00:00:01 -vframes 1 -vf "scale=200:200:force_original_aspect_ratio=decrease" %s 2>&1',
|
||||
escapeshellarg($ffmpeg),
|
||||
escapeshellarg($source),
|
||||
escapeshellarg($destination)
|
||||
);
|
||||
|
||||
exec($command, $output, $return_code);
|
||||
|
||||
return $return_code === 0 && file_exists($destination);
|
||||
}
|
||||
|
||||
?>
|
||||
Reference in New Issue
Block a user