mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-04 05:17:31 -05:00 
			
		
		
		
	Improve implementation
This commit is contained in:
		
							parent
							
								
									c11ff31cc3
								
							
						
					
					
						commit
						454182f49c
					
				@ -11,11 +11,17 @@ use CleverIt\UBL\Invoice\TaxTotal;
 | 
				
			|||||||
use horstoeko\zugferd\ZugferdDocumentBuilder;
 | 
					use horstoeko\zugferd\ZugferdDocumentBuilder;
 | 
				
			||||||
use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
 | 
					use horstoeko\zugferd\ZugferdDocumentPdfBuilder;
 | 
				
			||||||
use horstoeko\zugferd\ZugferdProfiles;
 | 
					use horstoeko\zugferd\ZugferdProfiles;
 | 
				
			||||||
 | 
					use Illuminate\Bus\Queueable;
 | 
				
			||||||
use Illuminate\Contracts\Queue\ShouldQueue;
 | 
					use Illuminate\Contracts\Queue\ShouldQueue;
 | 
				
			||||||
 | 
					use Illuminate\Foundation\Bus\Dispatchable;
 | 
				
			||||||
 | 
					use Illuminate\Queue\InteractsWithQueue;
 | 
				
			||||||
 | 
					use Illuminate\Queue\SerializesModels;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class CreateXRechnung implements ShouldQueue
 | 
					class CreateXRechnung implements ShouldQueue
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public Invoice $invoice;
 | 
					    public Invoice $invoice;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function __construct(Invoice $invoice)
 | 
					    public function __construct(Invoice $invoice)
 | 
				
			||||||
@ -41,14 +47,17 @@ class CreateXRechnung implements ShouldQueue
 | 
				
			|||||||
            ->addDocumentNote($invoice->public_notes)
 | 
					            ->addDocumentNote($invoice->public_notes)
 | 
				
			||||||
            ->setDocumentSupplyChainEvent(date_create($invoice->date))
 | 
					            ->setDocumentSupplyChainEvent(date_create($invoice->date))
 | 
				
			||||||
            ->setDocumentSeller($company->name)
 | 
					            ->setDocumentSeller($company->name)
 | 
				
			||||||
            //->addDocumentSellerGlobalId("4000001123452", "0088")
 | 
					 | 
				
			||||||
            //->addDocumentSellerTaxRegistration("FC", "201/113/40209")
 | 
					 | 
				
			||||||
            ->addDocumentSellerTaxRegistration("VA", $company->vat_number)
 | 
					 | 
				
			||||||
            ->setDocumentSellerAddress($company->address1, "", "", $company->postal_code, $company->city, $company->country->country->iso_3166_2)
 | 
					            ->setDocumentSellerAddress($company->address1, "", "", $company->postal_code, $company->city, $company->country->country->iso_3166_2)
 | 
				
			||||||
            ->setDocumentBuyer($client->name, $client->number)
 | 
					            ->setDocumentBuyer($client->name, $client->number)
 | 
				
			||||||
            ->setDocumentBuyerAddress($client->address1, "", "", $client->postal_code, $client->city, $client->country->country->iso_3166_2);
 | 
					            ->setDocumentBuyerAddress($client->address1, "", "", $client->postal_code, $client->city, $client->country->country->iso_3166_2);
 | 
				
			||||||
            //->addDocumentPaymentTerm("Zahlbar innerhalb 30 Tagen netto bis 04.04.2018, 3% Skonto innerhalb 10 Tagen bis 15.03.2018")
 | 
					            //->addDocumentPaymentTerm("Zahlbar innerhalb 30 Tagen netto bis 04.04.2018, 3% Skonto innerhalb 10 Tagen bis 15.03.2018")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (str_contains($company->vat_number, "/")){
 | 
				
			||||||
 | 
					            $xrechnung->addDocumentSellerTaxRegistration("FC", $company->vat_number);
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					        else {
 | 
				
			||||||
 | 
					            $xrechnung->addDocumentSellerTaxRegistration("VA", $company->vat_number);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        // Create line items and calculate taxes
 | 
					        // Create line items and calculate taxes
 | 
				
			||||||
        $taxamount_1 = $taxAmount_2 = $taxamount_3 = $taxnet_1 = $taxnet_2 = $taxnet_3 = 0.0;
 | 
					        $taxamount_1 = $taxAmount_2 = $taxamount_3 = $taxnet_1 = $taxnet_2 = $taxnet_3 = 0.0;
 | 
				
			||||||
        $netprice = 0.0;
 | 
					        $netprice = 0.0;
 | 
				
			||||||
@ -57,14 +66,18 @@ class CreateXRechnung implements ShouldQueue
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        foreach ($invoice->line_items as $index => $item){
 | 
					        foreach ($invoice->line_items as $index => $item){
 | 
				
			||||||
            $xrechnung->addNewPosition($index)
 | 
					            $xrechnung->addNewPosition($index)
 | 
				
			||||||
                ->setDocumentPositionProductDetails($item->notes, "", "TB100A4", null, "0160", "4012345001235")
 | 
					                ->setDocumentPositionProductDetails($item->notes)
 | 
				
			||||||
                ->setDocumentPositionGrossPrice($item->gross_line_total)
 | 
					                ->setDocumentPositionGrossPrice($item->gross_line_total)
 | 
				
			||||||
                ->setDocumentPositionNetPrice($item->line_total)
 | 
					                ->setDocumentPositionNetPrice($item->line_total);
 | 
				
			||||||
                ->setDocumentPositionQuantity($item->quantity, "H87")
 | 
					            if (isset($item->task_id)){
 | 
				
			||||||
                ->addDocumentPositionTax('S', 'VAT', 19);
 | 
					                $xrechnung->setDocumentPositionQuantity($item->quantity, "HUR");
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            else{
 | 
				
			||||||
 | 
					                $xrechnung->setDocumentPositionQuantity($item->quantity, "H87");
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
            $netprice += $this->getItemTaxable($item, $taxable);
 | 
					            $netprice += $this->getItemTaxable($item, $taxable);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // TODO: add tax rate
 | 
					            $xrechnung->addDocumentPositionTax('S', 'VAT', 19);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if ($item->discount > 0){
 | 
					            if ($item->discount > 0){
 | 
				
			||||||
                if ($invoice->is_amount_discount){
 | 
					                if ($invoice->is_amount_discount){
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user