diff --git a/app/modules_app/invoices/delete.php b/app/modules_app/invoices/delete.php new file mode 100644 index 0000000..a08359d --- /dev/null +++ b/app/modules_app/invoices/delete.php @@ -0,0 +1,49 @@ +beginTransaction(); + + $stmt = $db->prepare("SELECT * FROM invoices WHERE id = ? FOR UPDATE"); + $stmt->execute([$id]); + $invoice = $stmt->fetch(); + + if (!$invoice) json_error('Invoice not found', 404); + + // Super admin can delete anything. Others might only delete non-approved, but let's allow admin to delete. + if ($decoded['role'] !== 'super_admin' && $invoice['tenant_id'] !== $decoded['tenant_id']) { + json_error('Access denied', 403); + } + + $db->prepare("DELETE FROM invoice_lines WHERE invoice_id = ?")->execute([$id]); + $db->prepare("DELETE FROM jofotara_submissions WHERE invoice_id = ?")->execute([$id]); + $db->prepare("DELETE FROM invoices WHERE id = ?")->execute([$id]); + + $db->commit(); + + AuditLogger::log('invoice.deleted', 'invoice', $id, null, null, $decoded); + + json_success(null, 'تم حذف الفاتورة بنجاح'); + +} catch (\Exception $e) { + if ($db->inTransaction()) $db->rollBack(); + error_log("Invoice Delete Error: " . $e->getMessage()); + json_error('فشل في حذف الفاتورة', 500); +} diff --git a/app/modules_app/invoices/reject.php b/app/modules_app/invoices/reject.php new file mode 100644 index 0000000..47125ff --- /dev/null +++ b/app/modules_app/invoices/reject.php @@ -0,0 +1,48 @@ +beginTransaction(); + + $stmt = $db->prepare("SELECT * FROM invoices WHERE id = ? FOR UPDATE"); + $stmt->execute([$id]); + $invoice = $stmt->fetch(); + + if (!$invoice) json_error('Invoice not found', 404); + if ($invoice['status'] === 'approved') json_error('لا يمكن رفض فاتورة معتمدة', 400); + + $updateStmt = $db->prepare("UPDATE invoices SET status = 'rejected', updated_at = NOW() WHERE id = ?"); + $updateStmt->execute([$id]); + + $db->commit(); + + AuditLogger::log('invoice.rejected', 'invoice', $id, [ + 'old_status' => $invoice['status'], + ], [ + 'new_status' => 'rejected', + ], $decoded); + + json_success(null, 'تم رفض الفاتورة بنجاح'); + +} catch (\Exception $e) { + if ($db->inTransaction()) $db->rollBack(); + error_log("Invoice Reject Error: " . $e->getMessage()); + json_error('فشل في رفض الفاتورة', 500); +} diff --git a/musadaq-app/lib/features/scanner/controllers/scanner_controller.dart b/musadaq-app/lib/features/scanner/controllers/scanner_controller.dart index c189deb..385d025 100644 --- a/musadaq-app/lib/features/scanner/controllers/scanner_controller.dart +++ b/musadaq-app/lib/features/scanner/controllers/scanner_controller.dart @@ -4,6 +4,7 @@ import 'package:get/get.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as path; +import 'package:file_picker/file_picker.dart'; import '../../../core/services/upload_progress_service.dart'; import '../../../core/utils/logger.dart'; import '../../../core/utils/app_snackbar.dart'; @@ -91,6 +92,11 @@ class ScannerController extends GetxController { capturedImages.add(originalFile); int index = capturedImages.length - 1; + if (imagePath.toLowerCase().endsWith('.pdf')) { + AppLogger.print('Added PDF file, skipping image processing: $imagePath'); + return; + } + ImageProcessingService.processInvoiceImage(originalFile) .then((processedFile) { if (processedFile != null && index < capturedImages.length) { @@ -102,6 +108,28 @@ class ScannerController extends GetxController { }); } + Future pickPdfFile() async { + try { + FilePickerResult? result = await FilePicker.platform.pickFiles( + type: FileType.custom, + allowedExtensions: ['pdf'], + allowMultiple: true, + ); + + if (result != null) { + for (var file in result.files) { + if (file.path != null) { + addImage(file.path!); + } + } + AppSnackbar.showSuccess('تمت الإضافة', 'تم استيراد ملفات الفواتير بنجاح'); + } + } catch (e) { + AppLogger.error('Failed to pick PDF', e); + AppSnackbar.showError('خطأ', 'تعذر استيراد الملفات'); + } + } + void removeImage(int index) { if (index >= 0 && index < capturedImages.length) { capturedImages.removeAt(index); diff --git a/musadaq-app/lib/features/scanner/views/scanner_view.dart b/musadaq-app/lib/features/scanner/views/scanner_view.dart index e9632b4..2eda52f 100644 --- a/musadaq-app/lib/features/scanner/views/scanner_view.dart +++ b/musadaq-app/lib/features/scanner/views/scanner_view.dart @@ -119,6 +119,18 @@ class ScannerView extends GetView { state: state, children: [ AwesomeFlashButton(state: state), + const SizedBox(width: 16), + Container( + decoration: BoxDecoration( + color: Colors.black45, + borderRadius: BorderRadius.circular(8), + ), + child: IconButton( + onPressed: () => controller.pickPdfFile(), + icon: const Icon(Icons.picture_as_pdf, color: Colors.white), + tooltip: 'استيراد PDF', + ), + ), const Spacer(), TextButton.icon( onPressed: () => Get.back(), diff --git a/musadaq-app/pubspec.lock b/musadaq-app/pubspec.lock index eae5a09..8a2c11f 100644 --- a/musadaq-app/pubspec.lock +++ b/musadaq-app/pubspec.lock @@ -353,6 +353,14 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.1" + file_picker: + dependency: "direct main" + description: + name: file_picker + sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810 + url: "https://pub.dev" + source: hosted + version: "8.3.7" file_selector_linux: dependency: transitive description: diff --git a/musadaq-app/pubspec.yaml b/musadaq-app/pubspec.yaml index 598ae07..54f85c1 100644 --- a/musadaq-app/pubspec.yaml +++ b/musadaq-app/pubspec.yaml @@ -31,6 +31,7 @@ dependencies: camerawesome: ^2.0.0 cunning_document_scanner: ^1.2.3 image_picker: ^1.0.7 + file_picker: ^8.1.2 # ─── Image Processing ─────────────────────────────── image: ^4.1.7 diff --git a/public/index.php b/public/index.php index 796af84..a5690fa 100644 --- a/public/index.php +++ b/public/index.php @@ -35,6 +35,8 @@ $routes = [ 'v1/invoices/download_xml' => ['GET', 'invoices/download_xml.php'], 'v1/invoices/submit-jofotara' => ['POST', 'invoices/submit_jofotara.php'], 'v1/invoices/update' => ['POST', 'invoices/update.php'], + 'v1/invoices/reject' => ['POST', 'invoices/reject.php'], + 'v1/invoices/delete' => ['POST', 'invoices/delete.php'], 'v1/invoices/bulk-approve' => ['POST', 'invoices/bulk_approve.php'], 'v1/invoices/export' => ['GET', 'invoices/export.php'], 'v1/invoices/check-duplicate' => ['POST', 'invoices/check_duplicate.php'], diff --git a/public/shell.php b/public/shell.php index 02e741a..8e037ba 100644 --- a/public/shell.php +++ b/public/shell.php @@ -1759,6 +1759,9 @@ + @@ -2395,11 +2398,11 @@
+ style="background:var(--bg-card); border-radius:22px; box-shadow:var(--shadow-lg); width:100%; max-width:95vw; height:95vh; display:flex; overflow:hidden;">
+ style="flex:3; background:#F2F1FA; border-left:1px solid var(--border); position:relative; overflow:hidden;">
معاينة الملف
@@ -2415,15 +2418,20 @@
-
+
-
تفاصيل الفاتورة
+
+ تفاصيل الفاتورة + + + +
+ :class="currentInvoice?.status==='extracted' ? 'badge-blue' : (currentInvoice?.status==='approved' ? 'badge-teal' : (currentInvoice?.status==='rejected' ? 'badge-red' : 'badge-gray'))" + x-text="currentInvoice?.status === 'approved' ? '✓ مدققة' : (currentInvoice?.status === 'extracted' ? 'جاهزة للتدقيق' : (currentInvoice?.status === 'rejected' ? 'مرفوضة' : currentInvoice?.status))">
@@ -2455,26 +2463,35 @@
المورد (البائع)
-
-
+ + +
+
رقم الفاتورة والتاريخ
-
-
+ + +
+
المجموع الكلي
-
-
+ +
+
@@ -2562,10 +2579,18 @@ ⏳ جاري التدقيق... - +
+ + + +
@@ -2829,7 +2854,7 @@ showExcelModal: false, showBatchUploadModal: false, isUploadingBatch: false, batchProgress: { total: 0, current: 0 }, showAddTenantModal: false, showEditTenantModal: false, showTenantStatsModal: false, - acknowledgedWarnings: false, + acknowledgedWarnings: false, isEditingInvoice: false, isBusy: false, globalError: '', newUser: { name: '', email: '', password: '', role: 'accountant', tenant_id: '' }, @@ -2849,14 +2874,8 @@ subtitle() { return { dashboard: 'نظرة شاملة على نشاط النظام', users: 'إدارة المستخدمين والصلاحيات', companies: 'إدارة الشركات والربط بالفوترة الحكومية', invoices: 'رفع ومعالجة الفواتير الضريبية', tenants: 'إدارة المكاتب المحاسبية المشتركة', subscription: 'تفاصيل باقتك الحالية واستهلاك الموارد' }[this.page] || ''; }, get filteredInvoices() { - const now = new Date(); - const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1); - return this.invoices.filter(inv => { - // 1. Time Filter (Current Month) - const invDate = new Date(inv.invoice_date || inv.created_at); - if (invDate < startOfMonth) return false; - + // Removed time filter to prevent invoices from disappearing after a month // 2. Company Filter if (this.invoiceCompanyFilter && inv.company_id != this.invoiceCompanyFilter) return false; @@ -3155,6 +3174,83 @@ } }, + async rejectInvoice(id) { + if (this.isBusy) return; + if (!confirm('هل أنت متأكد من رفض هذه الفاتورة؟')) return; + this.isBusy = true; + try { + const res = await fetch('/index.php?route=v1/invoices/reject', { + method: 'POST', + headers: { 'Authorization': 'Bearer ' + this.token(), 'Content-Type': 'application/json' }, + body: JSON.stringify({ id: id }) + }); + const json = await res.json(); + this.isBusy = false; + + if (json.success) { + alert('تم رفض الفاتورة بنجاح!'); + this.showViewModal = false; + this.loadAll(); + } else { + this.showError(json.message); + } + } catch (e) { + this.isBusy = false; + this.showError('حدث خطأ أثناء رفض الفاتورة'); + } + }, + + async deleteInvoice(id) { + if (this.isBusy) return; + if (!confirm('هل أنت متأكد من حذف هذه الفاتورة بشكل نهائي؟ لا يمكن التراجع عن هذا الإجراء.')) return; + this.isBusy = true; + try { + const res = await fetch('/index.php?route=v1/invoices/delete', { + method: 'POST', + headers: { 'Authorization': 'Bearer ' + this.token(), 'Content-Type': 'application/json' }, + body: JSON.stringify({ id: id }) + }); + const json = await res.json(); + this.isBusy = false; + + if (json.success) { + alert('تم حذف الفاتورة بنجاح!'); + this.showViewModal = false; + this.loadAll(); + } else { + this.showError(json.message); + } + } catch (e) { + this.isBusy = false; + this.showError('حدث خطأ أثناء حذف الفاتورة'); + } + }, + + async updateInvoice() { + if (!this.currentInvoice || this.isBusy) return; + this.isBusy = true; + try { + const res = await fetch('/index.php?route=v1/invoices/update', { + method: 'POST', + headers: { 'Authorization': 'Bearer ' + this.token(), 'Content-Type': 'application/json' }, + body: JSON.stringify(this.currentInvoice) + }); + const json = await res.json(); + this.isBusy = false; + + if (json.success) { + alert('تم تحديث بيانات الفاتورة بنجاح!'); + this.isEditingInvoice = false; + this.loadAll(); + } else { + this.showError(json.message); + } + } catch (e) { + this.isBusy = false; + this.showError('حدث خطأ أثناء تحديث الفاتورة'); + } + }, + async uploadExcel() { const fileInput = document.getElementById('excelFileInput'); if (!fileInput.files[0]) return alert('الرجاء اختيار ملف اكسل');