refactor: article change -> refresh, recalc -> invoice#66

bin/backend/controls/articles/ArticleList.js

@@ -363,7 +363,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleList', [
                 });
 
                 QUIAjax.get('package_quiqqer_erp_ajax_products_calc', function (result) {
-                    self.$calculations = result;
+                    self.$calculations       = result;
+                    self.$calculationRunning = false;
                     self.fireEvent('calc', [self, result]);
                     resolve(result);
                 }, {

bin/backend/controls/articles/ArticleSummary.js

@@ -102,50 +102,6 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
                 return;
             }
 
-            var self = this;
-            //
-            // List.addEvent('onCalc', function (List) {
-            //     return;
-            //     var data = List.getCalculation();
-            //     console.log(data);
-            //     self.$NettoSum.set('html', self.$Formatter.format(data.nettoSum));
-            //     self.$BruttoSum.set('html', self.$Formatter.format(data.sum));
-            //
-            //     if (typeOf(data.vatArray) === 'array' && !data.vatArray.length) {
-            //         self.$VAT.set('html', '---');
-            //         return;
-            //     }
-            //
-            //     var key, Entry;
-            //     var vatText = '';
-            //
-            //     for (key in data.vatArray) {
-            //         if (!data.vatArray.hasOwnProperty(key)) {
-            //             continue;
-            //         }
-            //
-            //         Entry = data.vatArray[key];
-            //
-            //         if (typeof Entry.sum === 'undefined') {
-            //             Entry.sum = 0;
-            //         }
-            //
-            //         if (typeof Entry.text === 'undefined') {
-            //             Entry.text = '';
-            //         }
-            //
-            //         if (Entry.text === '') {
-            //             Entry.text = '';
-            //         }
-            //
-            //         Entry.sum = parseFloat(Entry.sum);
-            //
-            //         vatText = vatText + Entry.text + ' (' + self.$Formatter.format(Entry.sum) + ')<br />';
-            //     }
-            //
-            //     self.$VAT.set('html', vatText);
-            // });
-
             List.addEvent('onCalc', this.$refreshArticleSelect);
             List.addEvent('onArticleSelect', this.$refreshArticleSelect);
         },
@@ -229,7 +185,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
          * event: onArticleSelect
          *
          * @param List
-         * @param Article
+         * @param ArticleInstance
          */
         $refreshArticleSelect: function (List, ArticleInstance) {
             var calculated = List.getCalculation();
@@ -259,24 +215,38 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
             this.$NettoSum.set('html', this.$Formatter.format(calc.nettoSum));
             this.$BruttoSum.set('html', this.$Formatter.format(calc.sum));
 
-            return;
-            var self = this;
+            // vat display
+            if (typeOf(calc.vatArray) === 'array' && !calc.vatArray.length) {
+                this.$VAT.set('html', '---');
+            } else {
+                var key, Entry;
+                var vatText = '';
+
+                for (key in calc.vatArray) {
+                    if (!calc.vatArray.hasOwnProperty(key)) {
+                        continue;
+                    }
 
-            require(['Ajax'], function (QUIAjax) {
-                QUIAjax.get('package_quiqqer_erp_ajax_products_summary', function (result) {
-                    console.warn('##################');
-                    console.warn(result);
+                    Entry = calc.vatArray[key];
 
-                    self.$ArticleNettoSum.set('html', self.$Formatter.format(result.calculated.nettoSum));
-                    self.$ArticleBruttoSum.set('html', self.$Formatter.format(result.calculated.sum));
+                    if (typeof Entry.sum === 'undefined') {
+                        Entry.sum = 0;
+                    }
 
-                    self.$NettoSum.set('html', self.$Formatter.format(result.calculated.nettoSum));
-                    self.$BruttoSum.set('html', self.$Formatter.format(result.calculated.sum));
-                }, {
-                    'package': 'quiqqer/erp',
-                    article  : JSON.encode(Article.getAttributes())
-                });
-            });
+                    if (typeof Entry.text === 'undefined') {
+                        Entry.text = '';
+                    }
+
+                    if (Entry.text === '') {
+                        Entry.text = '';
+                    }
+
+                    Entry.sum = parseFloat(Entry.sum);
+                    vatText   = vatText + Entry.text + ' (' + this.$Formatter.format(Entry.sum) + ')<br />';
+                }
+
+                this.$VAT.set('html', vatText);
+            }
         }
     });
 });