Alan Lam 3 лет назад
Родитель
Сommit
d0448ac73a

+ 18 - 0
db/migrations/20221230163259_change_document_item_serial_number_column_to_text.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class ChangeDocumentItemSerialNumberColumnToText extends AbstractMigration {
+	public function up(): void {
+		$this->table("document_item")
+			->changeColumn("serial_number", "text", ["null" => true])
+			->update();
+	}
+
+	public function down(): void {
+		$this->table("document_item")
+			->changeColumn("serial_number", "string", ["null" => true])
+			->update();
+	}
+}

+ 4 - 0
engine/DocumentItem.php

@@ -64,4 +64,8 @@ class DocumentItem extends Model implements JsonSerializable {
 	public function getProduct(): ?Product {
 		return Product::get($this->product_id);
 	}
+
+	public function getSerialNumberHtml(): string {
+		return nl2br(htmlspecialchars($this->serial_number));
+	}
 }

+ 2 - 2
views/aru_dn_pdf.php

@@ -256,7 +256,7 @@ $render_card = static function(string $title, ?string $content): void {
 				?>
 				<tr>
 					<td><?=htmlspecialchars($item->description)?></td>
-					<td><?=htmlspecialchars($item->serial_number)?></td>
+					<td><?=$item->getSerialNumberHtml()?></td>
 					<td class="text-end"><?=htmlspecialchars($formatter->formatCurrency($item->insurance_value, $aru->currency))?></td>
 				</tr>
 				<?php
@@ -383,7 +383,7 @@ $render_card = static function(string $title, ?string $content): void {
 										<?php
 										if($aru_item->serial_number) {
 											?>
-											<span class="text-muted">(S/N: <?=htmlspecialchars($aru_item->serial_number)?>)</span>
+											<span class="text-muted">(S/N: <?=$aru_item->getSerialNumberHtml()?>)</span>
 											<?php
 										}
 										?>

+ 1 - 1
views/components/document_items_unstyled_list.php

@@ -17,7 +17,7 @@ namespace App;
 			if($item->serial_number) {
 				?>
 				<span class="text-muted">
-					(S/N: <?=htmlspecialchars($item->serial_number)?>)
+					(S/N: <?=$item->getSerialNumberHtml()?>)
 				</span>
 				<?php
 			}

+ 2 - 9
views/document.php

@@ -451,7 +451,7 @@ if($document->isSalesOrder() && !$document->isPartOfAru()) {
 						<?=htmlspecialchars($item->description ?? "")?>
 					</td>
 					<td>
-						<?=htmlspecialchars($item->serial_number ?? "")?>
+						<?=$item->getSerialNumberHtml()?>
 					</td>
 					<td class="text-end">
 						<?=htmlspecialchars($item->quantity ?? "")?>
@@ -468,16 +468,9 @@ if($document->isSalesOrder() && !$document->isPartOfAru()) {
 					<tr class="<?=$row_class?>">
 						<td>
 							<?=htmlspecialchars($item->description)?>
-							<?php
-							if($item->serial_number) {
-								?>
-								<span class="text-muted">(S/N: <?=htmlspecialchars($item->serial_number)?>)</span>
-								<?php
-							}
-							?>
 						</td>
 						<td>
-							<?=htmlspecialchars($item->serial_number)?>
+							<?=$item->getSerialNumberHtml()?>
 						</td>
 						<td class="text-end">
 							<?=htmlspecialchars($item->quantity)?>

+ 2 - 2
views/document_items_section.php

@@ -73,7 +73,7 @@ if($document->isAru()) {
 						<input class="form-check-input" id="all-items-checkbox" type="checkbox" />
 					</th>
 					<th><?=htmlspecialchars(__("Description"))?></th>
-					<th><?=htmlspecialchars(__("Serial Number"))?></th>
+					<th><?=htmlspecialchars(__("Serial Numbers"))?></th>
 					<th><?=htmlspecialchars(__("Quantity"))?></th>
 					<?php
 					if($document->hasCosts()) {
@@ -108,7 +108,7 @@ if($document->isAru()) {
 							<?=htmlspecialchars($item->description)?>
 						</td>
 						<td>
-							<?=htmlspecialchars($item->serial_number)?>
+							<?=$item->getSerialNumberHtml()?>
 						</td>
 						<td class="text-end">
 							<?=$item->quantity?>

+ 1 - 1
views/document_pdf.php

@@ -311,7 +311,7 @@ $is_part_of_aru = $document->isPartOfAru();
 						?>
 					</td>
 					<td class="font-monospace">
-						<?=htmlspecialchars($item->serial_number)?>
+						<?=$item->getSerialNumberHtml()?>
 					</td>
 					<td class="text-end font-monospace">
 						<?=$item->quantity?>

+ 2 - 2
views/modals/document_item.php

@@ -19,10 +19,10 @@ namespace App;
 				</div>
 				<div class="mb-3">
 					<label for="document-item-serial-number" class="form-label">
-						<?=htmlspecialchars(__("Serial Number"))?>
+						<?=htmlspecialchars(__("Serial Numbers"))?>
 					</label>
 
-					<input class="form-control" type="text" name="serial_number" id="document-item-serial-number" placeholder="<?=htmlspecialchars(__("Type serial number"))?>" maxlength="255" />
+					<textarea class="form-control" name="serial_number" id="document-item-serial-number" placeholder="<?=htmlspecialchars(__("Type serial number"))?>" maxlength="64000" rows="4"></textarea>
 				</div>
 				<div class="mb-3">
 					<label for="document-item-quantity" class="form-label">

+ 2 - 2
views/modals/new_document.php

@@ -71,9 +71,9 @@ $settings = $core->getSettings();
 
 					<div class="mb-3">
 						<label class="form-label" for="new-document-item-serial-number">
-							<?=htmlspecialchars(__("Serial Number"))?>
+							<?=htmlspecialchars(__("Serial Numbers"))?>
 						</label>
-						<input class="form-control" type="text" name="item_serial_number" id="new-document-item-serial-number" maxlength="255" placeholder="<?=htmlspecialchars(__("Type serial number"))?>" />
+						<textarea class="form-control" type="text" name="item_serial_number" id="new-document-item-serial-number" maxlength="64000" placeholder="<?=htmlspecialchars(__("Type serial numbers"))?>"></textarea>
 					</div>
 
 				</section>

+ 17 - 11
views/sale_invoices_section.php

@@ -23,7 +23,8 @@ use App\Helpers\HtmlHelper;
 			<colgroup>
 				<col style="width: 1%"/>
 				<col style="width: 15%"/>
-				<col style="width: 45%"/>
+				<col style="width: 30%"/>
+				<col style="width: 15%"/>
 				<col style="width: 10%"/>
 				<col style="width: 10%"/>
 				<col style="width: 10%"/>
@@ -35,6 +36,7 @@ use App\Helpers\HtmlHelper;
 				<th><?=htmlspecialchars(__("No."))?></th>
 				<th><?=htmlspecialchars(__("Status"))?></th>
 				<th><?=htmlspecialchars(__("Item"))?></th>
+				<th><?=htmlspecialchars(__("S/N"))?></th>
 				<th><?=htmlspecialchars(__("Qty"))?></th>
 				<th><?=htmlspecialchars(__("Subtotal"))?></th>
 				<th><?=htmlspecialchars(__("Tax"))?></th>
@@ -59,11 +61,19 @@ use App\Helpers\HtmlHelper;
 						<?=htmlspecialchars($sale_order->getDisplaySalesOrderStatus())?>
 					</td>
 					<td>
-						<?=htmlspecialchars($item->description ?? "")?>
 						<?php
-						if($item && $item->serial_number) {
+						if($item) {
 							?>
-							<span class="text-muted">(S/N: <?=htmlspecialchars($item->serial_number)?>)</span>
+							<?=htmlspecialchars($item->description)?>
+							<?php
+						}
+						?>
+					</td>
+					<td>
+						<?php
+						if($item) {
+							?>
+							<?=$item->getSerialNumberHtml()?>
 							<?php
 						}
 						?>
@@ -92,13 +102,9 @@ use App\Helpers\HtmlHelper;
 					<tr class="<?=$row_class?>">
 						<td>
 							<?=htmlspecialchars($item->description)?>
-							<?php
-							if($item->serial_number) {
-								?>
-								<span class="text-muted">(S/N: <?=htmlspecialchars($item->serial_number)?>)</span>
-								<?php
-							}
-							?>
+						</td>
+						<td>
+							<?=$item->getSerialNumberHtml()?>
 						</td>
 						<td class="text-end">
 							<?=htmlspecialchars($item->quantity)?>