diff --git a/public/css/app.css b/public/css/app.css index 443b0742f..1424ee98b 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1289,6 +1289,10 @@ input[type=file]::file-selector-button:hover{ border: 1px solid #cc0000 !important; } +.has-error .el-select__tags input { + border: transparent !important; + } + .input-money{ margin-top: 0.25rem; width: 100%; @@ -47876,11 +47880,16 @@ html[dir='rtl'] .el-picker-panel__sidebar { right: unset !important; } -.flatpickr-day.selected { - background-color: #55588B !important; +.flatpickr-day.selected, .flatpickr-day.startRange, .flatpickr-day.endRange, .flatpickr-day.selected.inRange, .flatpickr-day.startRange.inRange, .flatpickr-day.endRange.inRange, .flatpickr-day.selected:focus, .flatpickr-day.startRange:focus, .flatpickr-day.endRange:focus, .flatpickr-day.selected:hover, .flatpickr-day.startRange:hover, .flatpickr-day.endRange:hover, .flatpickr-day.selected.prevMonthDay, .flatpickr-day.startRange.prevMonthDay, .flatpickr-day.endRange.prevMonthDay, .flatpickr-day.selected.nextMonthDay, .flatpickr-day.startRange.nextMonthDay, .flatpickr-day.endRange.nextMonthDay { + background: #55588B !important; border-color: #55588B !important; } +.flatpickr-day.selected.startRange + .endRange:not(:nth-child(7n+1)), .flatpickr-day.startRange.startRange + .endRange:not(:nth-child(7n+1)), .flatpickr-day.endRange.startRange + .endRange:not(:nth-child(7n+1)) { + -webkit-box-shadow: -10px 0 0 #888aae !important; + box-shadow: -10px 0 0 #888aae !important; +} + .el-date-editor .el-range-input::-webkit-input-placeholder { color: #424242; } diff --git a/resources/assets/js/components/AkauntingContactCard.vue b/resources/assets/js/components/AkauntingContactCard.vue index 702720cca..67e299e9b 100644 --- a/resources/assets/js/components/AkauntingContactCard.vue +++ b/resources/assets/js/components/AkauntingContactCard.vue @@ -520,8 +520,27 @@ export default { this.add_new.html = ''; this.add_new_html = null; + this.contact_list.push({ + key: contact.id, + value: (contact.title) ? contact.title : (contact.display_name) ? contact.display_name : contact.name, + type: (contact.type) ? contact.type : 'customer', + id: contact.id, + name: (contact.title) ? contact.title : (contact.display_name) ? contact.display_name : contact.name, + email: (contact.email) ? contact.email : '', + tax_number: (contact.tax_number) ? contact.tax_number : '', + currency_code: (contact.currency_code) ? contact.currency_code : '', + phone: (contact.phone) ? contact.phone : '', + website: (contact.website) ? contact.website : '', + address: (contact.address) ? contact.address : '', + city: (contact.city) ? contact.city : '', + zip_code: (contact.zip_code) ? contact.zip_code : '', + state: (contact.state) ? contact.state : '', + country: (contact.country) ? contact.country : '', + location: (contact.location) ? contact.location : '', + reference: (contact.reference) ? contact.reference : '' + }); + this.$emit('new', contact); - this.$emit('change', this.contact); let documentClasses = document.body.classList; diff --git a/resources/assets/js/views/install/Database.vue b/resources/assets/js/views/install/Database.vue index 460f40657..9bee5953e 100644 --- a/resources/assets/js/views/install/Database.vue +++ b/resources/assets/js/views/install/Database.vue @@ -70,7 +70,7 @@