shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2796 from brkcvn/master

Browse Source 
Javascript console errors
This commit is contained in:
Burak Civan 2022-12-06 17:25:08 +03:00 committed by GitHub
commit 5542894ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/css/app.css vendored
View File

@ -54051,6 +54051,7 @@ html[dir='rtl'] .el-scrollbar__wrap {
} }
.collapse-sub{ .collapse-sub{
display: block;
height: 0px; height: 0px;
overflow: hidden; overflow: hidden;
opacity: 0; opacity: 0;
@ -56327,10 +56328,6 @@ body{
right: -2rem; right: -2rem;
} }
[dir="rtl"] .rtl\:float-left{
float: left;
}
[dir="rtl"] .rtl\:m-0{ [dir="rtl"] .rtl\:m-0{
margin: 0px; margin: 0px;
} }

18
resources/assets/js/views/common/documents.js vendored
View File

@ -114,7 +114,10 @@ const app = new Vue({
onRefFocus(ref) { onRefFocus(ref) {
let index = this.form.items.length - 1; let index = this.form.items.length - 1;
this.$refs['items-' + index + '-' + ref][0].focus(); if (this.$refs['items-' + index + '-' + ref] != undefined) {
let first_ref = this.$refs['items-' + index + '-' + ref];
first_ref != undefined ? first_ref[0].focus() : this.$refs[Object.keys(this.$refs)[0]][0].focus();
}
}, },
onCalculateTotal() { onCalculateTotal() {
@ -811,15 +814,20 @@ const app = new Vue({
watch: { watch: {
'form.discount': function (newVal, oldVal) { 'form.discount': function (newVal, oldVal) {
if (newVal != '' && newVal.search('^(?=.*?[0-9])[0-9.,]+$') !== 0) { if (newVal > 99) {
newVal = oldVal;
return;
}
if (newVal != '' && newVal.search('^[-+]?([0-9]|[1-9][0-9]|100)*\.?[0-9]+$') !== 0) {
this.form.discount = oldVal; this.form.discount = oldVal;
this.form.discount = this.form.discount.replace(',', '.'); this.form.discount = this.form.discount ? this.form.discount.replace(',', '.') : '';
return; return;
} }
for (let item of this.regex_condition) { for (let item of this.regex_condition) {
if (this.form.discount.includes(item)) { if (this.form.discount && this.form.discount.includes(item)) {
const removeLastChar = newVal.length - 1; const removeLastChar = newVal.length - 1;
const inputShown = newVal.slice(0, removeLastChar); const inputShown = newVal.slice(0, removeLastChar);
@ -827,7 +835,7 @@ const app = new Vue({
} }
} }
this.form.discount = this.form.discount.replace(',', '.'); this.form.discount = this.form.discount ? this.form.discount.replace(',', '.') : '';
}, },
'form.loading': function (newVal, oldVal) { 'form.loading': function (newVal, oldVal) {

2
resources/assets/sass/app.css vendored
View File

@ -561,7 +561,7 @@ html[dir='rtl'] .el-scrollbar__wrap {
} }
.collapse-sub { .collapse-sub {
@apply opacity-0 h-0 overflow-hidden; @apply block opacity-0 h-0 overflow-hidden;
} }
.collapse-sub-report.collapse-sub { .collapse-sub-report.collapse-sub {