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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk
2022-12-07 11:44:07 +03:00
parent 86a44fb3e5 19cf224171
commit 53c45256de
4 changed files with 16 additions and 11 deletions
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{
display: block;
height: 0px;
overflow: hidden;
opacity: 0;
@ -56327,10 +56328,6 @@ body{
right: -2rem;
}
[dir="rtl"] .rtl\:float-left{
float: left;
}
[dir="rtl"] .rtl\:m-0{
margin: 0px;
}

2
resources/assets/js/components/AkauntingSearch.vue
View File

@ -256,7 +256,7 @@ export default {
onInputDateSelected(selectedDates, dateStr, instance) {
this.filtered[this.filter_index].value = dateStr;
let date = instance.formatDate(selectedDates[0], 'Y-m-d');
let date = selectedDates.length ? instance.formatDate(selectedDates[0], 'Y-m-d') : null;
if (selectedDates.length > 1) {
let dates = [];

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

@ -114,7 +114,10 @@ const app = new Vue({
onRefFocus(ref) {
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() {
@ -811,15 +814,20 @@ const app = new Vue({
watch: {
'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 = this.form.discount.replace(',', '.');
this.form.discount = this.form.discount ? this.form.discount.replace(',', '.') : '';
return;
}
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 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) {

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

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