From 8ebc601a30df86b73a5d1bb9348d04231e13021b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 14 Jan 2018 21:40:42 +0200
Subject: [PATCH] Working on UBL

---
 app/Jobs/ConvertInvoiceToUbl.php              | 21 ++++++-------------
 resources/lang/en/texts.php                   |  1 -
 .../views/accounts/email_settings.blade.php   |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/Jobs/ConvertInvoiceToUbl.php b/app/Jobs/ConvertInvoiceToUbl.php
index c351c66e149c..755e2e22ed04 100644
--- a/app/Jobs/ConvertInvoiceToUbl.php
+++ b/app/Jobs/ConvertInvoiceToUbl.php
@@ -3,7 +3,7 @@
 namespace App\Jobs;
 
 use App\Jobs\Job;
-use Sabre\Xml\Service;
+use CleverIt\UBL\Invoice\Generator;
 use CleverIt\UBL\Invoice\Invoice;
 use CleverIt\UBL\Invoice\Party;
 use CleverIt\UBL\Invoice\Address;
@@ -25,13 +25,6 @@ class ConvertInvoiceToUbl extends Job
 
     public function handle()
     {
-        $xmlService = new Service();
-        $xmlService->namespaceMap = [
-            'urn:oasis:names:specification:ubl:schema:xsd:Invoice-2' => '',
-            'urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2' => 'cbc',
-            'urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2' => 'cac'
-        ];
-
         $invoice = $this->invoice;
         $account = $invoice->account;
         $client = $invoice->client;
@@ -64,7 +57,7 @@ class ConvertInvoiceToUbl extends Job
             $taxtotal = new TaxTotal();
             $taxAmount1 = $taxAmount2 = 0;
 
-            if ($item->tax_name1 || $item->tax_rate1) {
+            if ($item->tax_name1 || floatval($item->tax_rate1)) {
                 $taxAmount1 = $invoice->taxAmount($taxable, $invoice->tax_rate1);
                 $taxtotal->addTaxSubTotal((new TaxSubTotal())
                         ->setTaxAmount($taxAmount1)
@@ -75,7 +68,7 @@ class ConvertInvoiceToUbl extends Job
                             ->setPercent($item->tax_rate1)));
             }
 
-            if ($item->tax_name2 || $item->tax_rate2) {
+            if ($item->tax_name2 || floatval($item->tax_rate2)) {
                 $itemTaxAmount2 = $invoice->taxAmount($taxable, $invoice->tax_rate2);
                 $taxtotal->addTaxSubTotal((new TaxSubTotal())
                         ->setTaxAmount($taxAmount2)
@@ -95,9 +88,7 @@ class ConvertInvoiceToUbl extends Job
             ->setTaxExclusiveAmount($taxable)
             ->setPayableAmount($invoice->balance));
 
-        return $xmlService->write('Invoice', [
-            $ublInvoice
-        ]);
+        return Generator::invoice($ublInvoice, $invoice->client->getCurrencyCode());
     }
 
     public function createParty($company, $user)
@@ -141,7 +132,7 @@ class ConvertInvoiceToUbl extends Job
             $taxtotal = new TaxTotal();
             $itemTaxAmount1 = $itemTaxAmount2 = 0;
 
-            if ($item->tax_name1 || $item->tax_rate1) {
+            if ($item->tax_name1 || floatval($item->tax_rate1)) {
                 $itemTaxAmount1 = $invoice->taxAmount($taxable, $item->tax_rate1);
                 $taxtotal->addTaxSubTotal((new TaxSubTotal())
                         ->setTaxAmount($itemTaxAmount1)
@@ -152,7 +143,7 @@ class ConvertInvoiceToUbl extends Job
                             ->setPercent($item->tax_rate1)));
             }
 
-            if ($item->tax_name2 || $item->tax_rate2) {
+            if ($item->tax_name2 || floatval($item->tax_rate2)) {
                 $itemTaxAmount2 = $invoice->taxAmount($taxable, $item->tax_rate2);
                 $taxtotal->addTaxSubTotal((new TaxSubTotal())
                         ->setTaxAmount($itemTaxAmount2)
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 1f825398d516..3402cd1ececb 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2649,7 +2649,6 @@ $LANG = array(
     'signature_on_pdf_help' => 'Show the client signature on the invoice/quote PDF.',
     'expired_white_label' => 'The white label license has expired',
     'return_to_login' => 'Return to Login',
-    'beta' => 'Beta',
 
 );
 
diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php
index f62891059455..cc5a9b33251a 100644
--- a/resources/views/accounts/email_settings.blade.php
+++ b/resources/views/accounts/email_settings.blade.php
@@ -54,7 +54,7 @@
                     ])) : false) !!}
 
             {!! Former::checkbox('ubl_email_attachment')
-                    ->text(trans('texts.enable') . ' [' . trans('texts.beta') . ']')
+                    ->text(trans('texts.enable'))
                     ->value(1) !!}
 
             {!! Former::checkbox('document_email_attachment')