refactor: payments

bin/backend/controls/panels/TemporaryInvoice.Data.html

@@ -22,16 +22,6 @@
                 </label>
             </td>
         </tr>
-        <tr>
-            <td>
-                <label class="field-container">
-                    <span class="field-container-item" title="{{textTermOfPayment}}">
-                        {{textTermOfPayment}}
-                    </span>
-                    <input type="number" name="time_for_payment" min="1" max="999" class="field-container-field"/>
-                </label>
-            </td>
-        </tr>
         <tr>
             <td>
                 <label class="field-container">
@@ -76,9 +66,17 @@
                     <span class="field-container-item" title="{{textOrderedBy}}">
                         {{textPaymentType}}
                     </span>
-                    <select class="field-container-field" name="payment_type">
-
-                    </select>
+                    <select class="field-container-field" name="payment_type"></select>
+                </label>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label class="field-container">
+                    <span class="field-container-item" title="{{textTermOfPayment}}">
+                        {{textTermOfPayment}}
+                    </span>
+                    <input type="number" name="time_for_payment" min="1" max="999" class="field-container-field"/>
                 </label>
             </td>
         </tr>

bin/backend/controls/panels/TemporaryInvoice.js

@@ -29,6 +29,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
     'controls/users/address/Select',
     'package/quiqqer/invoice/bin/Invoices',
     'package/quiqqer/invoice/bin/backend/controls/articles/Text',
+    'package/quiqqer/payments/bin/backend/Payments',
     'Locale',
     'Mustache',
     'Users',
@@ -37,7 +38,8 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
     'css!package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice.css'
 
 ], function (QUI, QUIPanel, QUIButton, QUIButtonMultiple, QUISeparator, QUIConfirm, QUIFormUtils,
-             AddressSelect, Invoices, TextArticle, QUILocale, Mustache, Users, templateData) {
+             AddressSelect, Invoices, TextArticle,
+             Payments, QUILocale, Mustache, Users, templateData) {
     "use strict";
 
     var lg = 'quiqqer/invoice';
@@ -255,6 +257,12 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
                     }
                 }).inject(Container);
 
+            }).then(function () {
+                return Payments.getPayments();
+            }).then(function (payments) {
+                // load payments
+                console.log(payments);
+
                 self.getCategory('data').setActive();
                 self.Loader.hide();
 

src/QUI/ERP/Accounting/Invoice/TemporaryInvoice.php

@@ -254,7 +254,6 @@ public function save($User = null)
                 'subsum'        => $listCalculations['subSum'],
                 'sum'           => $listCalculations['sum'],
                 'vat_data'      => json_encode($listCalculations['vatArray'])
-
             ),
             array(
                 'id' => $this->getCleanId()