Skip to content
Code-Schnipsel Gruppen Projekte

Revisionen vergleichen

Änderungen werden so angezeigt, als ob die Quellrevision mit der Zielrevision zusammengeführt würde. Erfahre mehr über den Vergleich von Revisionen.

Quelle

Zielprojekt auswählen
No results found

Ziel

Zielprojekt auswählen
  • quiqqer/erp
1 Ergebnis
Änderungen anzeigen
Commits auf Quelle (6)
Alle erweitern Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/backend/controls/articles/Article.js
Zeige Datei @ 3921fea1
Dieser Diff ist reduziert.
bin/backend/controls/articles/ArticleList.js
Zeige Datei @ 3921fea1
Dieser Diff ist reduziert.
bin/backend/controls/articles/ArticleSummary.js
Zeige Datei @ 3921fea1
...@@ -25,11 +25,11 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -25,11 +25,11 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
return new Class({ return new Class({
Extends: QUIControl, Extends: QUIControl,
Type : 'package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', Type: 'package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary',
options: { options: {
List : null, List: null,
styles : false, styles: false,
currency: 'EUR', currency: 'EUR',
showPosSummary: true // show summary for selected article showPosSummary: true // show summary for selected article
...@@ -57,7 +57,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -57,7 +57,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
}, },
/** /**
* Create the domnode element * Create the dom-node element
* *
* @returns {HTMLDivElement} * @returns {HTMLDivElement}
*/ */
...@@ -66,16 +66,16 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -66,16 +66,16 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
this.$Elm = new Element('div', { this.$Elm = new Element('div', {
'data-qui': 'package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', 'data-qui': 'package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary',
'class' : 'quiqqer-erp-backend-temporaryErp-summary', 'class': 'quiqqer-erp-backend-temporaryErp-summary',
html : Mustache.render(template, { html: Mustache.render(template, {
showPosSummary: showPosSummary, showPosSummary: showPosSummary,
labelPosInfo : QUILocale.get(lg, 'article.summary.tpl.labelPosInfo'), labelPosInfo: QUILocale.get(lg, 'article.summary.tpl.labelPosInfo'),
labelNet : QUILocale.get(lg, 'article.summary.tpl.labelNet'), labelNet: QUILocale.get(lg, 'article.summary.tpl.labelNet'),
labelGross : QUILocale.get(lg, 'article.summary.tpl.labelGross'), labelGross: QUILocale.get(lg, 'article.summary.tpl.labelGross'),
labelSums : QUILocale.get(lg, 'article.summary.tpl.labelSums'), labelSums: QUILocale.get(lg, 'article.summary.tpl.labelSums'),
labelVat : QUILocale.get(lg, 'article.summary.tpl.labelVat'), labelVat: QUILocale.get(lg, 'article.summary.tpl.labelVat'),
}), }),
events : { events: {
mouseenter: this.showPriceFactors, mouseenter: this.showPriceFactors,
mouseleave: this.hidePriceFactors mouseleave: this.hidePriceFactors
} }
...@@ -137,8 +137,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -137,8 +137,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
Currency.getCurrency(currency).then((currency) => { Currency.getCurrency(currency).then((currency) => {
this.$Formatter = QUILocale.getNumberFormatter({ this.$Formatter = QUILocale.getNumberFormatter({
style : 'currency', style: 'currency',
currency : currency.code, currency: currency.code,
minimumFractionDigits: currency.precision, minimumFractionDigits: currency.precision,
maximumFractionDigits: currency.precision maximumFractionDigits: currency.precision
}); });
...@@ -208,7 +208,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -208,7 +208,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
Content.set('html', Mustache.render(template, { Content.set('html', Mustache.render(template, {
priceFactors: priceFactors, priceFactors: priceFactors,
vatArray : Object.values(calculations.vatArray) vatArray: Object.values(calculations.vatArray)
})); }));
const Total = Content.getElement('.quiqqer-erp-backend-temporaryErp-summaryWin-total'); const Total = Content.getElement('.quiqqer-erp-backend-temporaryErp-summaryWin-total');
...@@ -241,7 +241,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -241,7 +241,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
* @param ArticleInstance * @param ArticleInstance
*/ */
$refreshArticleSelect: function (List, ArticleInstance) { $refreshArticleSelect: function (List, ArticleInstance) {
let calculated = List.getCalculation(); let calculated = List.getCalculations();
if (typeof calculated.calculations === 'undefined') { if (typeof calculated.calculations === 'undefined') {
return; return;
...@@ -314,7 +314,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -314,7 +314,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
showPriceFactors: function () { showPriceFactors: function () {
const ArticleList = this.getAttribute('List'); const ArticleList = this.getAttribute('List');
let priceFactors = ArticleList.getPriceFactors(); let priceFactors = ArticleList.getPriceFactors();
let calculated = ArticleList.getCalculation(); let calculated = ArticleList.getCalculations();
if (typeof calculated.calculations === 'undefined') { if (typeof calculated.calculations === 'undefined') {
calculated.calculations = {}; calculated.calculations = {};
...@@ -326,19 +326,21 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -326,19 +326,21 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
} }
this.getCurrencyFormatter().then(() => { this.getCurrencyFormatter().then(() => {
console.log(calculated.calculations.vatArray);
const vat = Object.entries(calculated.calculations.vatArray).map((val) => { const vat = Object.entries(calculated.calculations.vatArray).map((val) => {
return { return {
text: val[1].text, text: val[1].text,
sum : this.$Formatter.format(val[1].sum) sum: this.$Formatter.format(val[1].sum)
}; };
}); });
this.$PriceFactors.set('html', Mustache.render(templatePriceFactor, { this.$PriceFactors.set('html', Mustache.render(templatePriceFactor, {
valueSubSum : calculated.calculations.display_subSum, valueSubSum: calculated.calculations.display_subSum,
valueSum : calculated.calculations.display_sum, valueSum: calculated.calculations.display_sum,
vat : vat, vat: vat,
textSubSum : QUILocale.get(lg, 'article.list.articles.subtotal'), textSubSum: QUILocale.get(lg, 'article.list.articles.subtotal'),
textSum : QUILocale.get(lg, 'article.list.articles.sumtotal'), textSum: QUILocale.get(lg, 'article.list.articles.sumtotal'),
priceFactors: priceFactors priceFactors: priceFactors
})); }));
...@@ -347,7 +349,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -347,7 +349,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
this.$PriceFactors.setStyle('bottom', 70); this.$PriceFactors.setStyle('bottom', 70);
this.$PFFX.animate({ this.$PFFX.animate({
bottom : 80, bottom: 80,
opacity: 1 opacity: 1
}, { }, {
duration: 300 duration: 300
...@@ -357,7 +359,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [ ...@@ -357,7 +359,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
hidePriceFactors: function () { hidePriceFactors: function () {
this.$PFFX.animate({ this.$PFFX.animate({
bottom : 70, bottom: 70,
opacity: 0 opacity: 0
}, { }, {
duration: 300, duration: 300,
......
src/QUI/ERP/Utils/User.php
Zeige Datei @ 3921fea1
...@@ -177,32 +177,36 @@ public static function getBruttoNettoUserStatus(UserInterface $User): int ...@@ -177,32 +177,36 @@ public static function getBruttoNettoUserStatus(UserInterface $User): int
// no address found // no address found
} }
// @todo es gibt neue einstellungen b2b, b2c b2bANDb2c ... von diesen einstellungen ausgehen
// @todo tax ist nicht optimal dafür
$isNetto = $Config->getValue('shop', 'isNetto'); $isNetto = $Config->getValue('shop', 'isNetto');
if ($isNetto) { if ($isNetto) {
self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER; self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
return self::$userBruttoNettoStatus[$uid]; return self::$userBruttoNettoStatus[$uid];
} }
try { try {
$Tax = QUI\ERP\Tax\Utils::getTaxByUser($User); $Tax = QUI\ERP\Tax\Utils::getTaxByUser($User);
if ($Tax->getValue() == 0) { if ($Tax->getValue() == 0) {
self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER; self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
return self::$userBruttoNettoStatus[$uid]; return self::$userBruttoNettoStatus[$uid];
} }
} catch (QUI\Exception) { } catch (QUI\Exception) {
self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER; }
return self::$userBruttoNettoStatus[$uid]; try {
$Package = QUI::getPackage('quiqqer/erp');
$Config = $Package->getConfig();
if ($Config->getValue('general', 'businessType') === 'B2B&B2C') {
self::$userBruttoNettoStatus[$uid] = self::IS_NETTO_USER;
return self::$userBruttoNettoStatus[$uid];
}
} catch (QUI\Exception) {
} }
self::$userBruttoNettoStatus[$uid] = self::IS_BRUTTO_USER; self::$userBruttoNettoStatus[$uid] = self::IS_BRUTTO_USER;
return self::$userBruttoNettoStatus[$uid]; return self::$userBruttoNettoStatus[$uid];
......

PCSG & QUIQQER support and DEV System - GitLab