From dade644d1c42784c9c09f07430f7eb7113cce9d7 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 27 Oct 2022 16:46:48 +0300 Subject: [PATCH 1/4] validation control for multi select --- public/css/app.css | 4 ++++ resources/assets/sass/app.css | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/public/css/app.css b/public/css/app.css index 0f82a05a1..a79a41490 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1290,6 +1290,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%; diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index ad3748e85..77951fcd9 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -12,6 +12,10 @@ border: 1px solid #cc0000 !important; } + .has-error .el-select__tags input { + border: transparent !important; + } + .input-money { @apply w-full text-sm px-3 py-2.5 mt-1 rounded-lg border border-light-gray text-black placeholder-light-gray bg-white disabled:bg-gray-200 focus:outline-none focus:ring-transparent focus:border-purple; } From a89f0344e1f4323a0accb44efb56e5a580457aac Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 27 Oct 2022 17:01:31 +0300 Subject: [PATCH 2/4] selected start-end rate color styling --- public/css/app.css | 9 +++++++-- resources/assets/sass/app.css | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index a79a41490..5c3ba6e39 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -47189,11 +47189,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/sass/app.css b/resources/assets/sass/app.css index 77951fcd9..10c6e1ca7 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -426,11 +426,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, .el-date-editor .el-range-input::placeholder { color: #424242; } From b7c501074472e63e41dca89b4f3d6c157789063b Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 27 Oct 2022 17:39:43 +0300 Subject: [PATCH 3/4] new item development for contact card --- .../js/components/AkauntingContactCard.vue | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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; From c48bb0e14d205e633838b6e11debd15f360a3075 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Fri, 28 Oct 2022 10:45:41 +0300 Subject: [PATCH 4/4] added prevent default for install form --- resources/assets/js/views/install/Database.vue | 5 +++-- resources/assets/js/views/install/Language.vue | 5 +++-- resources/assets/js/views/install/Settings.vue | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) 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 @@
-
-