Project-Pro/orderPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Jacek Pyziak
2026-04-03 11:30:14 +02:00
parent 39c318382a
commit 0e7ee957cb
15 changed files with 366 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Modules/Accounting/AccountingController.php
View File

@@ -140,7 +140,8 @@ final class AccountingController
$rowNum = 2;
foreach ($rows as $row) {
$sheet->setCellValue([1, $rowNum], (string) ($row['receipt_number'] ?? ''));
$sheet->setCellValue([2, $rowNum], (string) ($row['issue_date'] ?? ''));
$issueDateRaw = (string) ($row['issue_date'] ?? '');
$sheet->setCellValue([2, $rowNum], strlen($issueDateRaw) >= 16 ? substr($issueDateRaw, 0, 16) : $issueDateRaw);
$sheet->setCellValue([3, $rowNum], (string) ($row['sale_date'] ?? ''));
$sheet->setCellValue([4, $rowNum], (float) ($row['total_gross'] ?? 0));
$sheet->setCellValue([5, $rowNum], (string) ($row['config_name'] ?? ''));
@@ -201,7 +202,9 @@ final class AccountingController
return [
'id' => (string) $receiptId,
'receipt_number' => '<a href="/orders/' . $orderId . '/receipt/' . $receiptId . '">' . $receiptNumber . '</a>',
'issue_date' => (string) ($row['issue_date'] ?? ''),
'issue_date' => isset($row['issue_date']) && strlen((string) $row['issue_date']) >= 16
? substr((string) $row['issue_date'], 0, 16)
: (string) ($row['issue_date'] ?? ''),
'sale_date' => (string) ($row['sale_date'] ?? ''),
'total_gross' => $row['total_gross'] !== null
? number_format((float) $row['total_gross'], 2, '.', ' ')

6
src/Modules/Accounting/ReceiptController.php
View File

@@ -151,8 +151,10 @@ final class ReceiptController
}
$issueDate = trim((string) $request->input('issue_date', ''));
if ($issueDate === '' || strtotime($issueDate) === false) {
$issueDate = date('Y-m-d');
if ($issueDate !== '' && strtotime($issueDate) !== false) {
$issueDate = date('Y-m-d H:i:s', strtotime($issueDate));
} else {
$issueDate = date('Y-m-d H:i:s');
}
$saleDate = $this->resolveSaleDate($config, $order, $payments, $issueDate);