From c1995160ecefc22f05519592b1092751ab602f91 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Wed, 22 Jan 2020 23:21:55 +0300
Subject: [PATCH] print template styles updated

---
 public/css/print.css                          |  9 ++--
 .../sales/invoices/print_classic.blade.php    |  2 +-
 .../sales/invoices/print_default.blade.php    | 42 +++++++++----------
 .../sales/invoices/print_modern.blade.php     | 11 +++--
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/public/css/print.css b/public/css/print.css
index e707250c1..32a762d13 100644
--- a/public/css/print.css
+++ b/public/css/print.css
@@ -133,6 +133,7 @@ th, td {
 
 .text {
     color: #3c3f72;
+    margin-top:10px;
     font-size: 16px;
 }
 
@@ -212,7 +213,7 @@ th, td {
 */
 
 .c-logo {
-    padding-top: 50px;
+    padding-top: 25px;
 }
 
 .c-note {
@@ -234,7 +235,7 @@ th, td {
 .invoice-classic-inline-frame
 {
     margin: 0.3% 1% 0.3% 1%;
-    width: 95%;
+    width: 95 !important%;
     height: 59px;
     border: 3px solid #3c3f72;
 }
@@ -289,7 +290,7 @@ th, td {
 */
 
 .m-first-column {
-    padding-top: 35px;
+    padding-top: 15px;
     padding-bottom:48px;
 }
 
@@ -304,7 +305,7 @@ th, td {
 
 .m-fc-right {
     padding-left: 170px;
-     margin-top: -40px;
+     margin-top: -70px;
 }
 
 .m-note {
diff --git a/resources/views/sales/invoices/print_classic.blade.php b/resources/views/sales/invoices/print_classic.blade.php
index 63d8eabfa..fc9882bd5 100644
--- a/resources/views/sales/invoices/print_classic.blade.php
+++ b/resources/views/sales/invoices/print_classic.blade.php
@@ -136,7 +136,7 @@
                     <thead>
                         <tr>
                             @stack('name_th_start')
-                                <th class="item">{{ trans_choice($text_override['items'], 2) }}</th>
+                                <th class="text-left item">{{ trans_choice($text_override['items'], 2) }}</th>
                             @stack('name_th_end')
 
                             @stack('quantity_th_start')
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php
index 5b155cd7b..00716d635 100644
--- a/resources/views/sales/invoices/print_default.blade.php
+++ b/resources/views/sales/invoices/print_default.blade.php
@@ -3,35 +3,31 @@
 @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
 
 @section('content')
-    <div class="row">
+    <div class="row border-bottom-1">
             <div class="col-58">
-                <div class="border-bottom-1">
-                    <div class="text company">
-                        <img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
-                    </div>
+                <div class="text company">
+                    <img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
                 </div>
             </div>
 
             <div class="col-42">
-                <div class="border-bottom-1">
-                    <div class="text company">
-                        <strong>{{ setting('company.name') }}</strong><br>
-                        <p>{!! nl2br(setting('company.address')) !!}</p>
+                <div class="text company">
+                    <strong>{{ setting('company.name') }}</strong><br>
+                    <p>{!! nl2br(setting('company.address')) !!}</p>
 
-                        <p>
-                            @if (setting('company.tax_number'))
-                                {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
-                            @endif
-                        </p>
+                    <p>
+                        @if (setting('company.tax_number'))
+                            {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
+                        @endif
+                    </p>
 
-                        <p>
-                            @if (setting('company.phone'))
-                                {{ setting('company.phone') }}
-                            @endif
-                        </p>
+                    <p>
+                        @if (setting('company.phone'))
+                            {{ setting('company.phone') }}
+                        @endif
+                    </p>
 
-                        <p>{{ setting('company.email') }}</p>
-                    </div>
+                    <p>{{ setting('company.email') }}</p>
                 </div>
             </div>
         </div>
@@ -115,11 +111,11 @@
             <div class="text">
                 <table class="lines">
                     @foreach($invoice as $item)
-                        <thead style="background-color:{{ setting('invoice.color') }};">
+                        <thead style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
                     @endforeach
                         <tr>
                             @stack('name_th_start')
-                                <th class="item text-white">{{ trans_choice($text_override['items'], 2) }}</th>
+                                <th class="item text-left text-white">{{ trans_choice($text_override['items'], 2) }}</th>
                             @stack('name_th_end')
 
                             @stack('quantity_th_start')
diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php
index 500041dc9..dc2537ac3 100644
--- a/resources/views/sales/invoices/print_modern.blade.php
+++ b/resources/views/sales/invoices/print_modern.blade.php
@@ -3,10 +3,9 @@
 @section('title', trans_choice('general.invoices', 1) . ': ' . $invoice->invoice_number)
 
 @section('content')
-    <div class="row" style="background-color:{{ setting('invoice.color') }};">
+    <div class="row" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
         <div class="col-58 m-first-column">
             <div class="text company pl-2 m-fc-left">
-                <img src="{{ $logo }}" class="m-logo" alt="{{ setting('company.name') }}"/>
             </div>
             <div class="text company m-fc-right">
                 <strong class="text-white">{{ setting('company.name') }}</strong>
@@ -105,10 +104,10 @@
         <div class="col-100">
             <div class="text">
                 <table class="m-lines">
-                    <thead style="background-color:{{ setting('invoice.color') }};">
+                    <thead style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
                         <tr>
                             @stack('name_th_start')
-                                <th class="item text-white">{{ trans_choice($text_override['items'], 2) }}</th>
+                                <th class="item text-left text-white">{{ trans_choice($text_override['items'], 2) }}</th>
                             @stack('name_th_end')
 
                             @stack('quantity_th_start')
@@ -194,8 +193,8 @@
 
     @if ($invoice->footer)
         <div class="row mt-7">
-            <div class="col-100 py-2" style="background-color:{{ setting('invoice.color') }};">
-                <div class="text company pl-2">
+            <div class="col-100 py-2" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
+                <div class="text pl-2">
                     <strong class="text-white">{!! $invoice->footer !!}</strong>
                 </div>
             </div>