TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-31 05:31:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/app/pdf/estimate/estimate1.blade.php
View File

@ -182,6 +182,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.ship-user-phone {
font-style: normal;
@ -229,6 +230,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.bill-user-phone {

2
resources/views/app/pdf/estimate/estimate2.blade.php
View File

@ -142,6 +142,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.bill-user-phone {
font-style: normal;
@ -190,6 +191,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.ship-user-phone {

2
resources/views/app/pdf/estimate/estimate3.blade.php
View File

@ -146,6 +146,7 @@
line-height: 15px;
color: #595959;
margin: 0px;
width: 160px;
}
.ship-user-phone {
@ -184,6 +185,7 @@
line-height: 15px;
color: #595959;
margin: 0px;
width: 160px;
}
.bill-user-phone {

2
resources/views/app/pdf/invoice/invoice1.blade.php
View File

@ -182,6 +182,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.ship-user-phone {
font-style: normal;
@ -229,6 +230,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.bill-user-phone {

4
resources/views/app/pdf/invoice/invoice2.blade.php
View File

@ -142,6 +142,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.bill-user-phone {
font-style: normal;
@ -190,6 +191,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.ship-user-phone {
@ -435,7 +437,7 @@
@include('app.pdf.invoice.partials.billing-address')
</div>
</div>
@include('app.pdf.invoice.partials.table')
@include('app.pdf.invoice.partials.table')
@include('app.pdf.invoice.partials.notes')
</div>
</body>

4
resources/views/app/pdf/invoice/invoice3.blade.php
View File

@ -89,7 +89,7 @@
}
.bill-add {
display: inline;
display: block;
float:left;
width:40%;
padding: 0 0 0 30px;
@ -146,6 +146,7 @@
line-height: 15px;
color: #595959;
margin: 0px;
width: 160px;
}
.ship-user-phone {
@ -184,6 +185,7 @@
line-height: 15px;
color: #595959;
margin:0px;
width: 160px;
}
.bill-user-phone {