diff --git a/app/Factory/CompanyLedgerFactory.php b/app/Factory/CompanyLedgerFactory.php
index 7f4d53a0aeb5..accbbfb422c3 100644
--- a/app/Factory/CompanyLedgerFactory.php
+++ b/app/Factory/CompanyLedgerFactory.php
@@ -21,7 +21,7 @@ class CompanyLedgerFactory
$company_ledger->company_id = $company_id;
$company_ledger->user_id = $user_id;
$company_ledger->adjustment = 0;
- $company_ledger->balance = 0;
+ // $company_ledger->balance = 0;
$company_ledger->notes = '';
$company_ledger->hash = '';
$company_ledger->client_id = 0;
diff --git a/app/Jobs/EDocument/CreateEDocument.php b/app/Jobs/EDocument/CreateEDocument.php
index 9286dd98032e..478e98b444d2 100644
--- a/app/Jobs/EDocument/CreateEDocument.php
+++ b/app/Jobs/EDocument/CreateEDocument.php
@@ -26,6 +26,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
use horstoeko\zugferd\ZugferdDocumentBuilder;
use App\Services\EDocument\Standards\OrderXDocument;
use App\Services\EDocument\Standards\FacturaEInvoice;
+use App\Services\EDocument\Standards\FatturaPA;
use App\Services\EDocument\Standards\ZugferdEDokument;
class CreateEDocument implements ShouldQueue
@@ -62,11 +63,14 @@ class CreateEDocument implements ShouldQueue
$e_document_type = strlen($settings_entity->getSetting('e_invoice_type')) > 2 ? $settings_entity->getSetting('e_invoice_type') : "XInvoice_3_0";
$e_quote_type = strlen($settings_entity->getSetting('e_quote_type')) > 2 ? $settings_entity->getSetting('e_quote_type') : "OrderX_Extended";
+nlog($e_document_type);
if ($this->document instanceof Invoice){
switch ($e_document_type) {
case "FACT1":
return (new RoEInvoice($this->document))->generateXml();
+ case "FatturaPA":
+ return (new FatturaPA($this->document))->run();
case "EN16931":
case "XInvoice_3_0":
case "XInvoice_2_3":
diff --git a/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php b/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
index 24e223d604f4..c157511ce23f 100644
--- a/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
+++ b/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
@@ -47,34 +47,11 @@ class ClientLedgerBalanceUpdate implements ShouldQueue
*/
public function handle(): void
{
- $uuid = \Illuminate\Support\Str::uuid();
-
- // nlog("Updating company ledger for client {$this->client->id} {$uuid}");
-
+
MultiDB::setDb($this->company->db);
- // $dupes = CompanyLedger::query()
- // ->where('client_id', $this->client->id)
- // ->where('balance', 0)
- // ->where('hash', '<>', '')
- // ->groupBy(['adjustment','hash'])
- // ->havingRaw('COUNT(*) > 1')
- // ->pluck('id');
-
- // CompanyLedger::query()->whereIn('id', $dupes)->delete();
-
- // $dupes = CompanyLedger::query()
- // ->where('client_id', $this->client->id)
- // ->where('balance', 0)
- // ->where('hash', '<>', '')
- // ->groupBy(['adjustment','hash'])
- // ->havingRaw('COUNT(*) > 1')
- // ->pluck('id');
-
- // CompanyLedger::query()->whereIn('id', $dupes)->delete();
-
CompanyLedger::query()
- ->where('balance', 0)
+ ->whereNull('balance')
->where('client_id', $this->client->id)
->orderBy('id', 'ASC')
->get()
@@ -88,13 +65,11 @@ class ClientLedgerBalanceUpdate implements ShouldQueue
->orderBy('id', 'DESC')
->first();
- // $company_ledger->balance = $last_record->balance + $company_ledger->adjustment;
$company_ledger->balance = ($parent_ledger ? $parent_ledger->balance : 0) + $company_ledger->adjustment;
$company_ledger->save();
});
- // nlog("finished job {$uuid}");
}
public function middleware()
diff --git a/app/Mail/Subscription/OtpCode.php b/app/Mail/Subscription/OtpCode.php
index f6cafb778388..7cb850e21511 100644
--- a/app/Mail/Subscription/OtpCode.php
+++ b/app/Mail/Subscription/OtpCode.php
@@ -58,7 +58,7 @@ class OtpCode extends Mailable
'title' => ctrans('texts.otp_code_subject'),
'content' => ctrans('texts.otp_code_body', ['code' => $this->code]),
'whitelabel' => $this->company->account->isPaid(),
- 'url' => 'xx',
+ 'url' => '',
'button' => false,
'template' => $this->company->account->isPremium() ? 'email.template.admin_premium' : 'email.template.admin',
]);
diff --git a/app/Services/EDocument/Standards/FatturaPA.php b/app/Services/EDocument/Standards/FatturaPA.php
index 6c08be878ae7..069a1811764b 100644
--- a/app/Services/EDocument/Standards/FatturaPA.php
+++ b/app/Services/EDocument/Standards/FatturaPA.php
@@ -11,50 +11,33 @@
namespace App\Services\EDocument\Standards;
+use Sabre\Xml\Service;
use App\Models\Invoice;
use App\Services\AbstractService;
-use SimpleXMLElement;
-
-/*
-
-
-
- // Transmission data
- // Transmitter ID
- IT //Country code
- 01234567890 //Taxpayer code
-
- 00001 // Transmission progress
- FPR12 // Transmission format
- ABCDE1 // Receiver code
-
- //Seller/Provider
-
-
- //Buyer/Recipient
-
-
-
-
- //General data
- // Document general data
- TD01 // Document type
- EUR // Currency
- 2023-04-21 // Date
- 1 // Number
-
-
-
-
- //Goods and services data
-
-
- //Payment data
-
-
-
-
-*/
+use CleverIt\UBL\Invoice\FatturaPA\common\Sede;
+use CleverIt\UBL\Invoice\FatturaPA\common\Anagrafica;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiGenerali;
+use CleverIt\UBL\Invoice\FatturaPA\common\IdFiscaleIVA;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiContratto;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiPagamento;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiRicezione;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiRiepilogo;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiTrasporto;
+use CleverIt\UBL\Invoice\FatturaPA\common\RegimeFiscale;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiAnagrafici;
+use CleverIt\UBL\Invoice\FatturaPA\common\DettaglioLinee;
+use CleverIt\UBL\Invoice\FatturaPA\common\IdTrasmittente;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiBeniServizi;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiTrasmissione;
+use CleverIt\UBL\Invoice\FatturaPA\common\CedentePrestatore;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiOrdineAcquisto;
+use CleverIt\UBL\Invoice\FatturaPA\common\DettaglioPagamento;
+use CleverIt\UBL\Invoice\FatturaPA\common\FatturaElettronica;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiAnagraficiVettore;
+use CleverIt\UBL\Invoice\FatturaPA\common\DatiGeneraliDocumento;
+use CleverIt\UBL\Invoice\FatturaPA\common\CessionarioCommittente;
+use CleverIt\UBL\Invoice\FatturaPA\common\FatturaElettronicaBody;
+use CleverIt\UBL\Invoice\FatturaPA\common\FatturaElettronicaHeader;
class FatturaPA extends AbstractService
{
@@ -64,100 +47,294 @@ class FatturaPA extends AbstractService
//UFF001
/**
- * File Types
- *
- * EI01 => FILE VUOTO
- * EI02 => SERVIZIO NON DISPONIBILE
- * EI03 => UTENTE NON ABILITATO
+ * File Types
+ *
+ * EI01 => FILE VUOTO
+ * EI02 => SERVIZIO NON DISPONIBILE
+ * EI03 => UTENTE NON ABILITATO
+ */
+
+ /** Regime Fiscale
+ *
+ * //@todo - custom ui settings
+ *
+ * private array $types = [
+ * "RF01" => "Regime ordinario",
+ * "RF02" => "Regime dei contribuenti minimi (art. 1,c.96-117, L. 244/2007)",
+ * "RF04" => "Agricoltura e attività connesse e pesca (artt. 34 e 34-bis, D.P.R. 633/1972)",
+ * "RF05" => "Vendita sali e tabacchi (art. 74, c.1, D.P.R. 633/1972)",
+ * "RF06" => "Commercio dei fiammiferi (art. 74, c.1, D.P.R. 633/1972)",
+ * "RF07" => "Editoria (art. 74, c.1, D.P.R. 633/1972)",
+ * "RF08" => "Gestione di servizi di telefonia pubblica (art. 74, c.1, D.P.R. 633/1972)" ,
+ * "RF09" => "Rivendita di documenti di trasporto pubblico e di sosta (art. 74, c.1, D.P.R. 633/1972)" ,
+ * "RF10" => "Intrattenimenti, giochi e altre attività di cui alla tariffa allegata al D.P.R. 640/72 (art. 74, c.6, D.P.R. 633/1972)" ,
+ * "RF11" => "Agenzie di viaggi e turismo (art. 74-ter, D.P.R. 633/1972)" ,
+ * "RF12" => "Agriturismo (art. 5, c.2, L. 413/1991)" ,
+ * "RF13" => "Vendite a domicilio (art. 25-bis, c.6, D.P.R. 600/1973)" ,
+ * "RF14" => "Rivendita di beni usati, di oggetti d’arte, d’antiquariato o da collezione (art. 36, D.L. 41/1995)" ,
+ * "RF15" => "Agenzie di vendite all’asta di oggetti d’arte, antiquariato o da collezione (art. 40-bis, D.L. 41/1995)" ,
+ * "RF16" => "IVA per cassa P.A. (art. 6, c.5, D.P.R. 633/1972)" ,
+ * "RF17" => "IVA per cassa (art. 32-bis, D.L. 83/2012)" ,
+ * "RF19" => "Regime forfettario" ,
+ * "RF18" => "Altro"
+ * ];
+ */
+
+ /** Formato Trasmissione
+ * FPA12: This is the format used for FatturaPA version 1.2.
+ * FPR12: This format is used for FatturaPA version 1.2 in cases where the invoice is destined for the Public Administration.
+ * FPA1.2: This format is used for FatturaPA version 1.2.
+ * FPR1.2: This format is used for FatturaPA version 1.2 in cases where the invoice is destined for the Public Administration.
+ * FPR10: This format is used for FatturaPA version 1.0 in cases where the invoice is destined for the Public Administration.
+ * FPA10: This format is used for FatturaPA version 1.0.
+ */
+
+ /** Tipo Documento
+ *
+ * TD01 Fattura
+ * TD02 Acconto/Anticipo su fattura
+ * TD03 Acconto/Anticipo su parcella
+ * TD04 Nota di Credito
+ * TD05 Nota di Debito
+ * TD06 Parcella
+ * TD16 Integrazione fattura reverse charge interno
+ * TD17 Integrazione/autofattura per acquisto servizi dall’estero
+ * TD18 Integrazione per acquisto di beni intracomunitari
+ * TD19 Integrazione/autofattura per acquisto di beni ex art.17 c.2 DPR 633/72
+ * TD20 Autofattura per regolarizzazione e integrazione delle
+ * fatture (ex art.6 c.8 e 9-bis d.lgs. 471/97 o art.46 c.5 D.L. 331/93)
+ * TD21 Autofattura per splafonamento
+ * TD22 Estrazione beni da Deposito IVA
+ * TD23 Estrazione beni da Deposito IVA con versamento dell’IVA
+ * TD24 Fattura differita di cui all’art.21, comma 4, lett. a)
+ * TD25 Fattura differita di cui all’art.21, comma 4, terzo periodo lett. b)
+ * TD26 Cessione di beni ammortizzabili e per passaggi interni (ex art.36 DPR 633/72)
+ * TD27 Fattura per autoconsumo o per cessioni gratuite senza rivalsa
+ */
+
+ /** Esigibilità IVA
+ * "I" (Immediata): VAT is due and payable immediately upon issuance of the invoice.
+ * "D" (Differita): VAT is due at a later date, typically when payment for the goods or services is received.
+ * "S" (Soggetta): VAT is due under the reverse charge mechanism, where the recipient of the goods or services is responsible for accounting for the VAT.
*/
+ /**
+ * MP01 contanti //cash
+ * MP02 assegno //check
+ * MP03 assegno circolare //cashier's check
+ * MP04 contanti presso Tesoreria //cash at treasury
+ * MP05 bonifico //bank transfer
+ * MP06 vaglia cambiario //bill of exchange
+ * MP07 bollettino bancario //bank bulletin
+ * MP08 carta di pagamento //payment card
+ * MP09 RID //RID
+ * MP10 RID utenze //RID utilities
+ * MP11 RID veloce //fast RID
+ * MP12 Riba //Riba
+ * MP13 MAV //MAV
+ * MP14 quietanza erario stato //state treasury receipt
+ * MP15 giroconto su conti di contabilità speciale //transfer to special accounting accounts
+ * MP16 domiciliazione bancaria //bank domiciliation
+ * MP17 domiciliazione postale //postal domiciliation
+ * MP18 bollettino di c/c postale //postal giro account
+ * MP19 SEPA Direct Debit //SEPA Direct Debit
+ * MP20 SEPA Direct Debit CORE //SEPA Direct Debit CORE
+ * MP21 SEPA Direct Debit B2B //SEPA Direct Debit B2B
+ * MP22 Trattenuta su somme già riscosse //Withholding on sums already collected
+ * MP23 PagoPA //PagoPA
+ */
+
/**
+ * TP01 pagamento a rate //payment in installments
+ * TP02 pagamento completo //full payment
+ * TP03 anticipo //advance
+ */
+
+ /**
* @param Invoice $invoice
*/
public function __construct(public Invoice $invoice)
{
- $this->xml = new SimpleXMLElement('
- * At the end of your 14 day trial your card will be charged $10/month. Cancel anytime.
+ * At the end of your 14 day trial your card will be charged $12/month. Cancel anytime.
['auth:vendor', 'vendor_locale', 'domain_db'], 'pr
Route::post('documents/download_multiple', [App\Http\Controllers\VendorPortal\DocumentController::class, 'downloadMultiple'])->name('documents.download_multiple');
Route::get('documents/{document}/download', [App\Http\Controllers\VendorPortal\DocumentController::class, 'download'])->name('documents.download');
Route::get('documents/{document}/download_pdf', [App\Http\Controllers\VendorPortal\DocumentController::class, 'download'])->name('documents.download_pdf');
+ Route::get('purchase_order/{invitation_key}/download_e_purchase_order', [App\Http\Controllers\PurchaseOrderController::class, 'downloadEPurchaseOrder'])->name('purchase_order.download_e_purchase_order')->middleware('token_auth');
+
Route::resource('documents', App\Http\Controllers\VendorPortal\DocumentController::class)->only(['index', 'show']);
});