Skip to content
GitLab
Erkunden
Anmelden
Registrieren
Primärnavigation
Suchen oder aufrufen …
Projekt
invoice
Verwalten
Aktivität
Mitglieder
Labels
Planen
Tickets
18
Ticketübersichten
Meilensteine
Wiki
Code
Merge Requests
0
Repository
Branch
Commits
Tags
Repository-Diagramm
Revisionen vergleichen
Build
Pipelines
Aufgaben
Pipeline-Zeitpläne
Artefakte
Bereitstellung
Releases
Betreiben
Umgebungen
Überwachen
Vorfälle
Service-Desk
Analysieren
Wertschöpfungskettenanalyse
Mitwirkenden-Analyse
CI/CD-Analyse
Repository-Analysen
Hilfe
Hilfe
Support
GitLab-Dokumentation
GitLab-Pläne vergleichen
Community-Forum
Zu GitLab beitragen
Feedback geben
Tastenkürzel
?
Code-Schnipsel
Gruppen
Projekte
Show more breadcrumbs
QUIQQER
invoice
Commits
05008557
Commit
05008557
erstellt
vor 2 Jahren
von
Henning Leutz
Dateien durchsuchen
Optionen
Downloads
Patches
Einfaches Diff
feat: refactor:
erp#78
Übergeordneter
1ccf01c2
No related branches found
No related tags found
Keine zugehörigen Merge Requests gefunden
Änderungen
2
Leerzeichenänderungen ausblenden
Inline
Nebeneinander
2 geänderte Dateien
ajax/invoices/temporary/save.php
+12
-7
12 Ergänzungen, 7 Löschungen
ajax/invoices/temporary/save.php
bin/backend/controls/panels/TemporaryInvoice.js
+3
-0
3 Ergänzungen, 0 Löschungen
bin/backend/controls/panels/TemporaryInvoice.js
werden angezeigt
mit
15 Ergänzungen
und
7 Löschungen
ajax/invoices/temporary/save.php
+
12
−
7
Zeige Datei @
05008557
...
...
@@ -4,9 +4,6 @@
* This file contains package_quiqqer_invoice_ajax_invoices_temporary_save
*/
use
QUI\ERP\Shipping\Shipping
;
use
QUI\ERP\Accounting\Invoice\Handler
as
InvoiceHandler
;
/**
* Saves the temporary invoice
*
...
...
@@ -17,7 +14,7 @@
'package_quiqqer_invoice_ajax_invoices_temporary_save'
,
function
(
$invoiceId
,
$data
)
{
$Invoice
=
QUI\ERP\Accounting\Invoice\Utils\Invoice
::
getTemporaryInvoiceByString
(
$invoiceId
);
$data
=
\
json_decode
(
$data
,
true
);
$data
=
json_decode
(
$data
,
true
);
if
(
empty
(
$data
[
'customer_id'
]))
{
$data
[
'invoice_address_id'
]
=
''
;
...
...
@@ -44,13 +41,21 @@ function ($invoiceId, $data) {
unset
(
$data
[
'articles'
]);
}
if
(
isset
(
$data
[
'priceFactors'
]))
{
try
{
$List
=
new
QUI\ERP\Accounting\PriceFactors\FactorList
(
$data
[
'priceFactors'
]);
$Invoice
->
getArticles
()
->
importPriceFactors
(
$List
);
}
catch
(
QUI\Exception
$Exception
)
{
}
}
if
(
isset
(
$data
[
'currency'
]))
{
$Invoice
->
setCurrency
(
$data
[
'currency'
]);
}
if
(
!
empty
(
$data
[
'currencyRate'
]))
{
$Currency
=
$Invoice
->
getCurrency
();
$Currency
->
setExchangeRate
(
\
floatval
(
$data
[
'currencyRate'
]));
$Currency
->
setExchangeRate
(
floatval
(
$data
[
'currencyRate'
]));
$Invoice
->
setCurrency
(
$Currency
);
}
...
...
@@ -61,8 +66,8 @@ function ($invoiceId, $data) {
$Invoice
->
clearCustomerFiles
();
if
(
!
empty
(
$data
[
'attached_customer_files'
]))
{
if
(
\
is_string
(
$data
[
'attached_customer_files'
]))
{
$customerFiles
=
\
json_decode
(
$data
[
'attached_customer_files'
],
true
);
if
(
is_string
(
$data
[
'attached_customer_files'
]))
{
$customerFiles
=
json_decode
(
$data
[
'attached_customer_files'
],
true
);
}
else
{
$customerFiles
=
$data
[
'attached_customer_files'
];
}
...
...
This diff is collapsed.
Zum Erweitern klicken.
bin/backend/controls/panels/TemporaryInvoice.js
+
3
−
0
Zeige Datei @
05008557
...
...
@@ -172,6 +172,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
};
self
.
setAttribute
(
'
articles
'
,
data
.
articles
.
articles
);
self
.
setAttribute
(
'
priceFactors
'
,
data
.
articles
.
priceFactors
);
}
if
(
data
.
invoice_address
)
{
...
...
@@ -279,6 +280,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
invoice_address_id
:
this
.
getAttribute
(
'
invoice_address_id
'
),
project_name
:
this
.
getAttribute
(
'
project_name
'
),
articles
:
this
.
getAttribute
(
'
articles
'
),
priceFactors
:
this
.
getAttribute
(
'
priceFactors
'
),
date
:
this
.
getAttribute
(
'
date
'
),
editor_id
:
this
.
getAttribute
(
'
editor_id
'
),
ordered_by
:
this
.
getAttribute
(
'
ordered_by
'
),
...
...
@@ -1233,6 +1235,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
if
(
this
.
$ArticleList
)
{
this
.
setAttribute
(
'
articles
'
,
this
.
$ArticleList
.
save
());
this
.
setAttribute
(
'
priceFactors
'
,
this
.
$ArticleList
.
getPriceFactors
());
this
.
$serializedList
=
this
.
$ArticleList
.
serialize
();
if
(
destroyList
)
{
...
...
This diff is collapsed.
Zum Erweitern klicken.
Henning Leutz
@henbug
mentioned in issue
erp#78 (closed)
·
vor 2 Jahren
mentioned in issue
erp#78 (closed)
mentioned in issue erp#78
Commit-Liste ein-/ausklappen
Vorschau
0%
Wiederholen
oder
Neue Datei anhängen
.
Abbrechen
You are about to add
0
people
to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Kommentar speichern
Abbrechen
Bitte
registrieren
oder
Anmelden
zum Kommentieren