diff --git a/app/Codes/PrefCode.php b/app/Codes/PrefCode.php index 3b9e94c..caba7c5 100644 --- a/app/Codes/PrefCode.php +++ b/app/Codes/PrefCode.php @@ -120,4 +120,10 @@ enum PrefCode: string } return $ret; } + + static public function getName(PrefCode $code) + { + $dic = self::getDictionary(); + return data_get($dic, $code->value, ""); + } } diff --git a/app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php b/app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php index 28bbc29..bf4b8ad 100644 --- a/app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php +++ b/app/Logic/ReceiptIssuingOrder/PDFDownLoadManager.php @@ -2,6 +2,7 @@ namespace App\Logic\ReceiptIssuingOrder; +use App\Codes\PrefCode; use App\Events\ReceiptIssuingOrder\DownloadedEvent; use App\Exceptions\AppCommonException; use App\Models\ReceiptIssuingOrder; @@ -62,7 +63,8 @@ class PDFDownLoadManager extends ReceiptIssuingOrderManager ...$this->order->toArray(), ReceiptIssuingOrder::COL_NAME_STATUS_RECEIPT_CONFIRM_DATETIME => $o->status_receipt_confirm_datetime->format('Y/m/d'), ReceiptIssuingOrder::COL_NAME_RECEIPT_USE_DATE => $o->receipt_use_date->format('Y/m/d'), - ReceiptIssuingOrder::COL_NAME_RECEIPT_AMOUNT => number_format($o->receipt_amount) + ReceiptIssuingOrder::COL_NAME_RECEIPT_AMOUNT => number_format($o->receipt_amount), + 'pref_name' => PrefCode::getName($o->mail_pref_code), ]; } } diff --git a/app/Models/ReceiptIssuingOrder.php b/app/Models/ReceiptIssuingOrder.php index af60654..32c4dee 100644 --- a/app/Models/ReceiptIssuingOrder.php +++ b/app/Models/ReceiptIssuingOrder.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Codes\PrefCode; use App\Models\Feature\ContractFeature; use Illuminate\Database\Eloquent\Relations\HasOne; @@ -59,6 +60,7 @@ class ReceiptIssuingOrder extends AppModel self::COL_NAME_STATUS_RECEIPT_DOWNLOAD_DATETIME => 'datetime', self::COL_NAME_STATUS_RECEIPT_EMAIL_SEND_DATETIME => 'datetime', self::COL_NAME_RECEIPT_USE_DATE => 'date', + self::COL_NAME_MAIL_PREF_CODE => PrefCode::class, ]; diff --git a/resources/css/receipt_letter.css b/resources/css/receipt_letter.css index da21dde..7b60703 100644 --- a/resources/css/receipt_letter.css +++ b/resources/css/receipt_letter.css @@ -8,7 +8,14 @@ section.address { #address { position: absolute; top: 10mm; - left:40mm; + left:30mm; + font-size: 4mm; +} + +#address div.name{ + padding-top: 2mm; + padding-left: 3mm; + font-size: 4.5mm; } diff --git a/resources/views/pdf/receipt_letter.blade.php b/resources/views/pdf/receipt_letter.blade.php index 86a0271..62a3cef 100644 --- a/resources/views/pdf/receipt_letter.blade.php +++ b/resources/views/pdf/receipt_letter.blade.php @@ -15,12 +15,27 @@
-
〒242-0005
+
〒{{ sprintf("%s-%s", substr($mail_zip_code, 0, 3), substr($mail_zip_code, 3) ) }}
- 神奈川県 + {{ $pref_name }}
+ @if($mail_address1) +
+ {{ $mail_address1 }} +
+ @endif + @if($mail_address2) +
+ {{ $mail_address2 }} +
+ @endif + @if($mail_address3) +
+ {{ $mail_address3 }} +
+ @endif
- 岩渕様 + {{ $mail_name }} 様