From a78ebbd32236fb95dafa13e4fae7f16c61b1a14f Mon Sep 17 00:00:00 2001 From: weichien Date: Tue, 27 Apr 2021 02:07:29 +0800 Subject: [PATCH 1/7] update - 4 document blade files. --- .../views/pages/pdfs/deliver_order.blade.php | 171 +++++++++------- .../views/pages/pdfs/payment_order.blade.php | 176 ++++++++++------- .../views/pages/pdfs/purchase_order.blade.php | 182 +++++++++++------- .../pdfs/supplier_deliver_order.blade.php | 166 +++++++++------- 4 files changed, 426 insertions(+), 269 deletions(-) diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php index 7e7f9e0f..fb00d869 100644 --- a/resources/views/pages/pdfs/deliver_order.blade.php +++ b/resources/views/pages/pdfs/deliver_order.blade.php @@ -1,73 +1,110 @@ @extends('layouts.base_pdf') @section('inner_content') - -

Deliver Order

-
-
-
-

Bill To

-
Marking: {{ $transaction->booking->marking }}
-
Company: {{ $supplier->name }}
-
Phone: {{ $supplier->contacts()->first()->phone }}
-
-
EDO: {{ $transaction->bill_no }}
-
REF: {{ $transaction->payment_reference ?? '-' }}
-
Date: {{ $transaction->created_at }}
-
-
-
- CIEF Worldwide Sdn Bhd (1134596-M)Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya +
+ +

+
{{ $transaction->bill_no }}
+ + + + + + +
+ + + CIEF WORLDWIDE SDN BHD + + + (1134596-M)
+ Malaysian Global Innovation & Creativity Center
+ Level 1 CWS, Block 3730, Persiaran APEC,
+ 63000 Cyberjaya, Malaysian.
+ Tel: 018-2909252 + 		+
+ + Delivery Order +
-
Phone: 0182909252
- - -
- - + +
EDO: {{ $transaction->bill_no }}
+ + +
REF: {{ $transaction->payment_reference ?? '-' }}
+
Date: {{ $transaction->created_at }}
+
 
+ + + + + + + + +
+ + Bill To + +
+
+ Company: {{ $supplier->name }} +
+
+ sdas sda sdsd dtaman asdksd 4.000 +
+
+ Phone: {{ $supplier->contacts()->first()->phone }} +
+
+ +
+
+ + + + + + + + + + + + + @foreach ($transaction->transactionDetails as $key => $transaction_detail) - - - - - + + + + + + - @foreach($transaction->transactionDetails as $transaction_detail) - - - - - - - - @endforeach - {{-- - - - - - - - + @endforeach + + + + + + + + + + + + - - - - --}} - - - - - -
NoStock CodeDescriptionQuantityUnit Price (RM)Total Amount
(RM)
Product CodeProduct NameQuantityPriceAmount{{ $key + 1 }}{{ $transaction_detail->product_code }}{{ $transaction_detail->product_name }}{{ $transaction_detail->quantity }}{{ $transaction_detail->convert_original_price() }}{{ $transaction_detail->convert_original_amount() }}
{{ $transaction_detail->product_code }}{{ $transaction_detail->product_name }}{{ $transaction_detail->quantity }}MYR {{ $transaction_detail->convert_original_price() }}MYR {{ $transaction_detail->convert_original_amount() }}
SubtotalMYR
AdjustmentMYR
Subtotal{{ $transaction->convert_original_amount() }}
Total{{ $transaction->convert_original_amount() }}
Biling ChargesMYR
TotalMYR {{ $transaction->convert_original_amount() }}
-
- - -@endsection \ No newline at end of file + +
+ + + + + + +
This is generated by computer. No signature required.Page {PAGENO} of {nbpg}
+ +@endsection diff --git a/resources/views/pages/pdfs/payment_order.blade.php b/resources/views/pages/pdfs/payment_order.blade.php index 34bcdfb8..e9e48299 100644 --- a/resources/views/pages/pdfs/payment_order.blade.php +++ b/resources/views/pages/pdfs/payment_order.blade.php @@ -1,73 +1,113 @@ @extends('layouts.base_pdf') @section('inner_content') - -

Payment Order

-
-
-
-

Bill To

-
Marking: {{ $transaction->booking->marking }}
-
Company: {{ $supplier->name }}
-
Phone: {{ $supplier->contacts()->first()->phone }}
-
-
EDO: {{ $transaction->bill_no }}
-
REF: {{ $transaction->payment_reference ?? '-' }}
-
Date: {{ $transaction->created_at }}
-
-
-
- CIEF Worldwide Sdn Bhd (1134596-M)Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya +
+ +

+
{{ $transaction->bill_no }}
+ + + + + + + + + + + + + {{-- + + + + --}} + + + + + + +
+ + + CIEF WORLDWIDE SDN BHD + + + (1134596-M)
+ Malaysian Global Innovation & Creativity Center
+ Level 1 CWS, Block 3730, Persiaran APEC,
+ 63000 Cyberjaya, Malaysian.
+ Tel: 018-2909252 + 		+
+ + Invoice +
-
Phone: 0182909252
- - -
- - + +
EI#: {{ $transaction->bill_no }}
+ + +
Ref# {{ $transaction->payment_reference ?? '-' }}
+
Date: {{ $transaction->created_at }}
+
 
+ + + + + + + + +
+ + Bill To + +
+
+ Company: {{ $supplier->name }} +
+
+ sdas sda sdsd dtaman asdksd 4.000 +
+
+ Phone: {{ $supplier->contacts()->first()->phone }} +
+
+ +
+
+ + + + + + + + + + + + + @foreach ($transaction->transactionDetails as $key => $transaction_detail) - - - - - + + + + + + - @foreach($transaction->transactionDetails as $transaction_detail) - - - - - - - - @endforeach - {{-- - - - - - - - - - - - - --}} - - - - - -
NoStock CodeDescriptionQuantityUnit Price (RM)Total Amount
(RM)
Product CodeProduct NameQuantityPriceAmount{{ $key + 1 }}{{ $transaction_detail->product_code }}{{ $transaction_detail->product_name }}{{ $transaction_detail->quantity }}{{ $transaction_detail->convert_original_price() }}{{ $transaction_detail->convert_original_amount() }}
{{ $transaction_detail->product_code }}{{ $transaction_detail->product_name }}{{ $transaction_detail->quantity }}MYR {{ $transaction_detail->convert_original_price() }}MYR {{ $transaction_detail->convert_original_amount() }}
SubtotalMYR
AdjustmentMYR
Biling ChargesMYR
TotalMYR {{ $transaction->convert_original_amount() }}
-
- - -@endsection \ No newline at end of file + @endforeach +
Subtotal{{ $transaction->convert_original_amount() }}
Billing Charges{{ $transaction->service_charge }}
Total{{ $transaction->convert_original_amount() }}
+ + + + + + +
This is generated by computer. No signature required.Page {PAGENO} of {nbpg}
+ +@endsection diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php index 2423d239..5f196a4b 100644 --- a/resources/views/pages/pdfs/purchase_order.blade.php +++ b/resources/views/pages/pdfs/purchase_order.blade.php @@ -1,74 +1,120 @@ @extends('layouts.base_pdf') @section('inner_content') - -

Purchase Order

-
-
-
-

Buyer

-
Marking: {{ $transaction->booking->marking }}
-
Company: {{ $supplier->name }}
-
Phone: {{ $supplier->contacts()->first()->phone }}
+
+ +

+
{{ $transaction->bill_no }}
+ +
+ + + + + +
+ Purchase Order + + PO#: {{ $transaction->bill_no }}
+ Ref#: {{ $transaction->payment_reference ?? '-' }}
+ Date: {{ $transaction->created_at }} +
+ +
+ + + + + + + + + + + {{-- + + + + --}} + + + + + + +
+ + Buyer +
-
PO: {{ $transaction->bill_no }}
-
REF: {{ $transaction->payment_reference ?? '-' }}
-
Date: {{ $transaction->created_at }}
- -
-

Seller

-
- CIEF Worldwide Sdn Bhd (1134596-M)Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya + +
+ Marking#: {{ $transaction->booking->marking }}
-
Phone: 0182909252
-
-
-
- - + + + {{ $supplier->name }} + + + {{-- {{ $supplier }} --}} + +
+ + {{-- {{ $buyer['address'] }} --}} + +
+ + Phone: {{ $supplier->contacts()->first()->phone }} + + + + +
+ + Seller + +
+ + CIEF Worldwide Sdn Bhd (1134596-M) + +
+ Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya +
+
+ Phone: 0182909252 +
+
+ +
+ + + + + + + + + + + + + + @foreach ($transaction->transactionDetails as $key => $transaction_detail) - - - - - + + + + + + - @foreach($transaction->transactionDetails as $transaction_detail) - - - - - - - - @endforeach - {{-- - - - - - - - - - - - - --}} - - - - - -
NoStock CodeDescriptionQuantityUnit Price (RM)Total Amount
(RM)
Product CodeProduct NameQuantityPriceAmount{{ $key + 1 }}{{ $transaction_detail->product_code }}{{ $transaction_detail->product_name }}{{ $transaction_detail->quantity }}{{ $transaction_detail->convert_original_price() }}{{ $transaction_detail->convert_original_amount() }}
{{ $transaction_detail->product_code }}{{ $transaction_detail->product_name }}{{ $transaction_detail->quantity }}MYR {{ $transaction_detail->convert_original_price() }}MYR {{ $transaction_detail->convert_original_amount() }}
SubtotalMYR
AdjustmentMYR
Biling ChargesMYR
TotalMYR {{ $transaction->convert_original_amount() }}
-
- - -@endsection \ No newline at end of file + @endforeach +
Subtotal{{ $transaction->convert_original_amount() }}
Billing Charges{{ number_format($billingcharges, 2) }}
Total{{ $transaction->convert_original_amount() }}
+ + + + + + +
This is generated by computer. No signature required.Page {PAGENO} of {nbpg}
+ +@endsection diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php index a3ff56cc..c7f6b183 100644 --- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php +++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php @@ -1,73 +1,107 @@ @extends('layouts.base_pdf') @section('inner_content') - -

Supplier Deliver Order

-
-
-
-

Bill To

-
Marking: {{ $transaction->booking->marking }}
-
Company: {{ $supplier->name }}
-
Phone: {{ $supplier->contacts()->first()->phone }}
+
+ +
+ + + + +
+ Atvantic Import & Export Snd. Bhd (1309816-P)
+ +
+ + + + + +
+ Delivery Order + + PO#: {{ $transaction->bill_no }}
+ Ref#: {{ $transaction->payment_reference ?? '-' }}
+ Date: {{ $transaction->created_at }} +
+ +
+ + + +
+ + Buyer +
-
EDO: {{ $transaction->bill_no }}
-
REF: {{ $transaction->payment_reference ?? '-' }}
-
Date: {{ $transaction->created_at }}
- -
-
- CIEF Worldwide Sdn Bhd (1134596-M)Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya + +
+ CIEF Worldwide Sdn Bhd (1134596-M)
-
Phone: 0182909252
-
-
-
- - + + + Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya + + + {{-- {{ $supplier }} --}} + +
+ + {{-- {{ $buyer['address'] }} --}} + +
+ + Phone: 0182909252 + + + +
+ +
+ + + + + + + + + + + + + + @foreach ($transaction->transactionDetails as $key => $transaction_detail) - - - - - + + + + + + - @foreach($transaction->transactionDetails as $transaction_detail) - - - - - - - - @endforeach - {{-- - - - - - - - + @endforeach + + + + + + + + + + + + - - - - --}} - - - - - -
NoStock CodeDescriptionQuantityUnit Price (RM)Total Amount
(RM)
Product CodeProduct NameQuantityPriceAmount{{ $key + 1 }}{{ $transaction_detail->product_code }}{{ $transaction_detail->product_name }}{{ $transaction_detail->quantity }}{{ $transaction_detail->convert_original_price() }}{{ $transaction_detail->convert_original_amount() }}
{{ $transaction_detail->product_code }}{{ $transaction_detail->product_name }}{{ $transaction_detail->quantity }}MYR {{ $transaction_detail->convert_original_price() }}MYR {{ $transaction_detail->convert_original_amount() }}
SubtotalMYR
AdjustmentMYR
Subtotal{{ $transaction->convert_original_amount() }}
Total{{ $transaction->convert_original_amount() }}
Biling ChargesMYR
TotalMYR {{ $transaction->convert_original_amount() }}
-
- - -@endsection \ No newline at end of file + +
+ + + + + + +
This is generated by computer. No signature required.Page {PAGENO} of {nbpg}
+ +@endsection From 75b201d24873994708981db5521f01016e36a6ef Mon Sep 17 00:00:00 2001 From: weichien Date: Tue, 27 Apr 2021 02:26:41 +0800 Subject: [PATCH 2/7] fix: case-sensitive of defining class --- app/Models/Transaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index d77eda88..267831c3 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -17,7 +17,7 @@ class Transaction extends AbstractModel implements Documentable */ public function booking(): BelongsTo { - return $this->BelongsTo( booking::class, 'booking_id', 'id'); + return $this->BelongsTo( Booking::class, 'booking_id', 'id'); } /** From 3d0837c0a1d310ddb911ae445a0421bf5bd71104 Mon Sep 17 00:00:00 2001 From: weichien Date: Tue, 27 Apr 2021 02:31:36 +0800 Subject: [PATCH 3/7] fix: Generate PDF with MPDF lib. --- .../CreateInvoiceTransactionProcessor.php | 30 +++++-------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php index c4bd49cc..4954558f 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php @@ -17,11 +17,11 @@ use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; use App\Classes\ValueObjects\Constants\DocumentType; -use Barryvdh\DomPDF\PDF; use App\Models\Booking; use Illuminate\Database\Eloquent\Model; +use MPDF; class CreateInvoiceTransactionProcessor { /** @var ListsTransactions */ @@ -51,18 +51,6 @@ class CreateInvoiceTransactionProcessor /** @var UpdatesBookingStatus */ private $updatesBookingStatus; - /** @var PDF */ - private $purchase_pdf; - - /** @var PDF */ - private $deliver_pdf; - - /** @var PDF */ - private $payment_pdf; - - /** @var PDF */ - private $supplier_pdf; - /** * CreateInvoiceTransactionLogic constructor. * @param ListsTransactions $listsTransactions @@ -70,7 +58,7 @@ class CreateInvoiceTransactionProcessor * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber * @param CalculatesBookingPaidAmount $calculatesBookingPaidAmount */ - public function __construct(ListsTransactions $listsTransactions, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesBookingStatus $updatesBookingStatus, PDF $purchase_pdf, PDF $deliver_pdf, PDF $payment_pdf, PDF $supplier_pdf) + public function __construct(ListsTransactions $listsTransactions, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingPaidAmount $calculatesBookingPaidAmount, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesBookingStatus $updatesBookingStatus) { $this->listsTransactions = $listsTransactions; $this->generatesTransactionBillNumber = $generatesTransactionBillNumber; @@ -81,10 +69,6 @@ class CreateInvoiceTransactionProcessor $this->createsDocument = $createsDocument; $this->createsFile = $createsFile; $this->updatesBookingStatus = $updatesBookingStatus; - $this->purchase_pdf = $purchase_pdf; - $this->deliver_pdf = $deliver_pdf; - $this->payment_pdf = $payment_pdf; - $this->supplier_pdf = $supplier_pdf; } /** @@ -134,7 +118,7 @@ class CreateInvoiceTransactionProcessor $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]); - $purchase_order_pdf = $this->purchase_pdf->loadView('pages.pdfs.purchase_order', ['transaction' => $po_order_transaction, 'supplier' => $supplier]); + $purchase_order_pdf = MPDF::loadView('pages.pdfs.purchase_order', ['transaction' => $po_order_transaction, 'supplier' => $supplier]); $document_object = new DocumentObject( DocumentType::PURCHASE_ORDER, [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))], @@ -145,7 +129,7 @@ class CreateInvoiceTransactionProcessor $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object); $this->createsFile->execute($document, $document_object); - $deliver_order_pdf = $this->deliver_pdf->loadView('pages.pdfs.deliver_order', ['transaction' => $po_order_transaction, 'supplier' => $supplier]); + $deliver_order_pdf = MPDF::loadView('pages.pdfs.deliver_order', ['transaction' => $po_order_transaction, 'supplier' => $supplier]); $document_object = new DocumentObject( DocumentType::DELIVER_ORDER, [chunk_split('data:application/pdf;base64,'.base64_encode($deliver_order_pdf->output()))], @@ -156,7 +140,7 @@ class CreateInvoiceTransactionProcessor $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object); $this->createsFile->execute($document, $document_object); - $payment_order_pdf = $this->payment_pdf->loadView('pages.pdfs.payment_order', ['transaction' => $po_order_transaction, 'supplier' => $supplier]); + $payment_order_pdf = MPDF::loadView('pages.pdfs.payment_order', ['transaction' => $po_order_transaction, 'supplier' => $supplier]); $document_object = new DocumentObject( DocumentType::PAYMENT_ORDER, [chunk_split('data:application/pdf;base64,'.base64_encode($payment_order_pdf->output()))], @@ -167,7 +151,7 @@ class CreateInvoiceTransactionProcessor $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object); $this->createsFile->execute($document, $document_object); - $supplier_order_pdf = $this->supplier_pdf->loadView('pages.pdfs.supplier_deliver_order', ['transaction' => $po_order_transaction, 'supplier' => $supplier]); + $supplier_order_pdf = MPDF::loadView('pages.pdfs.supplier_deliver_order', ['transaction' => $po_order_transaction, 'supplier' => $supplier]); $document_object = new DocumentObject( DocumentType::SUPPLIER_DELIVER_ORDER, [chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))], @@ -183,4 +167,4 @@ class CreateInvoiceTransactionProcessor } } } -} \ No newline at end of file +} From 0356fb534b9b331dd6782091d4d193cde8b699dd Mon Sep 17 00:00:00 2001 From: weichien Date: Tue, 27 Apr 2021 02:33:42 +0800 Subject: [PATCH 4/7] feat: define MPDF config. --- config/app.php | 3 +++ config/pdf.php | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 config/pdf.php diff --git a/config/app.php b/config/app.php index a8881019..c080002d 100644 --- a/config/app.php +++ b/config/app.php @@ -178,6 +178,8 @@ return [ // Third Parties Spatie\Permission\PermissionServiceProvider::class, Barryvdh\DomPDF\ServiceProvider::class, + Meneses\LaravelMpdf\LaravelMpdfServiceProvider::class + ], /* @@ -230,6 +232,7 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, 'PDF' => Barryvdh\DomPDF\Facade::class, + 'MPDF' => Meneses\LaravelMpdf\Facades\LaravelMpdf::class, ], diff --git a/config/pdf.php b/config/pdf.php new file mode 100644 index 00000000..3459543c --- /dev/null +++ b/config/pdf.php @@ -0,0 +1,27 @@ + '', + 'format' => 'A4', + 'default_font_size' => '12', + 'default_font' => 'sans-serif', + 'margin_left' => 10, + 'margin_right' => 10, + 'margin_top' => 10, + 'margin_bottom' => 10, + 'margin_header' => 0, + 'margin_footer' => 0, + 'orientation' => 'P', + 'title' => 'Laravel mPDF', + 'author' => '', + 'watermark' => '', + 'show_watermark' => false, + 'watermark_font' => 'sans-serif', + 'display_mode' => 'fullpage', + 'watermark_text_alpha' => 0.1, + 'custom_font_dir' => '', + 'custom_font_data' => [], + 'auto_language_detection' => false, + 'temp_dir' => rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR), + 'pdfa' => false, + 'pdfaauto' => false, +]; \ No newline at end of file From ff72d9a0d0db09f7207f6128a600d8b1d3085b64 Mon Sep 17 00:00:00 2001 From: weichien Date: Tue, 27 Apr 2021 02:34:23 +0800 Subject: [PATCH 5/7] fix: PDF document standard CSS styling --- resources/views/layouts/base_pdf.blade.php | 170 +++++++++++++++++---- 1 file changed, 141 insertions(+), 29 deletions(-) diff --git a/resources/views/layouts/base_pdf.blade.php b/resources/views/layouts/base_pdf.blade.php index 013c9871..99eb376a 100644 --- a/resources/views/layouts/base_pdf.blade.php +++ b/resources/views/layouts/base_pdf.blade.php @@ -1,36 +1,148 @@ - + + - - + body { + font-family: sun-extA; + } + + .header { + margin-top: 5em; + } + + .separator { + text-align: right; + border-bottom: 0.5px solid black; + font-size: 0.7em; + } + + img.logo { + top: 10px; + } + + img { + height: 6em; + width: 9em; + } + + .title { + font-size: 2em; + font-weight: 1200; + } + + .details { + display: inline-block; + position: relative; + + } + + .sub-title { + font-size: 1.3em; + font-weight: bold; + } + + .label { + font-size: 1.1em; + font-weight: bold; + } + + .bill-to { + margin-top: 30px; + } + + table { + width: 100%; + vertical-align: top; + } + + th { + border-bottom: 1px solid black; + } + + td { + padding: 0.4em; + /* text-align: center; */ + } + + td.title { + text-align: left; + } + td.description, + th.description { + text-align: justify; + max-width: 40em; + } + + td.stock-code, + th.stock-code { + text-align: center; + } + + th { + vertical-align: middle; + } + + td, + th { + /* margin-top: 0.6em; + margin-right: 0.6em; */ + } + + .subtotal td { + border-top: 1px solid black; + } + + .total { + border-top: 1px solid black; + border-bottom: 3px double black; + font-weight: bolder; + } + + .address {} + + */ td.header-logo { + /* text-align: left; */ + width: fit-content; + } + + td.header-cief-address { + text-align: left; + margin-left: -30px; + } + + td.header-details { + text-align: left; + vertical-align: top; + } + + td.bill-to { + text-align: left; + } + + td.document-detail { + text-align: left; + border: 1px solid black; + padding: 1em 1em 1em 1em; + width: 16em; + } + + td.address { + text-align: left; + } + + .right { + text-align: right; + } + + From 8c85bfe190a7603bdbe22a75849401c6ca3fa64f Mon Sep 17 00:00:00 2001 From: weichien Date: Tue, 27 Apr 2021 02:35:55 +0800 Subject: [PATCH 6/7] add mpdf wrapper package. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index ec061d4f..4d27cd7f 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "ext-fileinfo": "*", "ext-json": "^1.6", "barryvdh/laravel-dompdf": "^0.9.0", + "carlos-meneses/laravel-mpdf": "^2.1", "fideloper/proxy": "^4.2", "fruitcake/laravel-cors": "^1.0", "guzzlehttp/guzzle": "^6.3", From a3df023adb16d41e94ad1183de4dffa0bdef1982 Mon Sep 17 00:00:00 2001 From: weichien Date: Tue, 27 Apr 2021 03:13:02 +0800 Subject: [PATCH 7/7] add cief logo --- resources/assets/images/ri_1.png | Bin 0 -> 3733 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/assets/images/ri_1.png diff --git a/resources/assets/images/ri_1.png b/resources/assets/images/ri_1.png new file mode 100644 index 0000000000000000000000000000000000000000..f4b2eef5f726171125d0e8ee4b0bdd6d94cfe290 GIT binary patch literal 3733 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