mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-04 04:57:35 -05:00 
			
		
		
		
	Fix invoice templates, rendering, borders, and spacing (#3352)
* Fix invoice templates, rendering, borders, and spacing * Update invoices to use $entity_labels & $entity object
This commit is contained in:
		
							parent
							
								
									9e9cd37b87
								
							
						
					
					
						commit
						bdc1848ce2
					
				@ -58,7 +58,7 @@ class Bold extends AbstractDesign
 | 
				
			|||||||
        return '
 | 
					        return '
 | 
				
			||||||
            <div class="flex mt-32 pl-12">
 | 
					            <div class="flex mt-32 pl-12">
 | 
				
			||||||
                <div class="w-1/2 mr-40 flex flex-col">
 | 
					                <div class="w-1/2 mr-40 flex flex-col">
 | 
				
			||||||
                    <h2 class="text-2xl uppercase font-semibold text-teal-600 tracking-tight">$your_invoice</h2> $client_details
 | 
					                    <h2 class="text-2xl uppercase font-semibold text-teal-600 tracking-tight">$your_invoice_label</h2> $client_details
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
                <div class="w-1/2">
 | 
					                <div class="w-1/2">
 | 
				
			||||||
                    <div class="w-full bg-teal-600 px-5 py-3 text-white flex">
 | 
					                    <div class="w-full bg-teal-600 px-5 py-3 text-white flex">
 | 
				
			||||||
@ -99,7 +99,7 @@ class Bold extends AbstractDesign
 | 
				
			|||||||
            
 | 
					            
 | 
				
			||||||
            <div class="flex px-4 mt-6 w-full px-12">
 | 
					            <div class="flex px-4 mt-6 w-full px-12">
 | 
				
			||||||
                <div class="w-1/2">
 | 
					                <div class="w-1/2">
 | 
				
			||||||
                    $invoice.public_notes
 | 
					                    $entity.public_notes
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
                <div class="w-1/2 flex">
 | 
					                <div class="w-1/2 flex">
 | 
				
			||||||
                    <div class="w-1/2 text-right flex flex-col">
 | 
					                    <div class="w-1/2 text-right flex flex-col">
 | 
				
			||||||
 | 
				
			|||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@ -38,7 +38,7 @@ class Plain extends AbstractDesign
 | 
				
			|||||||
                    <div class="px-12 py-8">
 | 
					                    <div class="px-12 py-8">
 | 
				
			||||||
                        <div class="flex">
 | 
					                        <div class="flex">
 | 
				
			||||||
                            <div class="w-1/3">
 | 
					                            <div class="w-1/3">
 | 
				
			||||||
                                $invoice_label
 | 
					                                $entity_label
 | 
				
			||||||
                            </div>
 | 
					                            </div>
 | 
				
			||||||
                            <div class="w-1/3 flex flex-col">
 | 
					                            <div class="w-1/3 flex flex-col">
 | 
				
			||||||
                                $company_details
 | 
					                                $company_details
 | 
				
			||||||
@ -98,7 +98,7 @@ class Plain extends AbstractDesign
 | 
				
			|||||||
        <div class="flex justify-between mt-8">
 | 
					        <div class="flex justify-between mt-8">
 | 
				
			||||||
            <div class="w-1/2">
 | 
					            <div class="w-1/2">
 | 
				
			||||||
                <div class="flex flex-col">
 | 
					                <div class="flex flex-col">
 | 
				
			||||||
                    <p>$invoice.public_notes</p>
 | 
					                    <p>$entity.public_notes</p>
 | 
				
			||||||
                    <div class="pt-4">
 | 
					                    <div class="pt-4">
 | 
				
			||||||
                        <p class="font-bold">$terms_label</p>
 | 
					                        <p class="font-bold">$terms_label</p>
 | 
				
			||||||
                        <p>$terms</p>
 | 
					                        <p>$terms</p>
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										147
									
								
								app/Designs/Playful.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										147
									
								
								app/Designs/Playful.php
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user