From 5b7c246af16028f0900a79fdaeb20c5de306ed60 Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Mon, 20 Jun 2022 14:02:25 +0300
Subject: [PATCH 1/5] added notes for scripts

---
 .../components/layouts/admin/scripts.blade.php | 18 +++++++++++++++++-
 .../layouts/portal/scripts.blade.php           | 15 +++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/resources/views/components/layouts/admin/scripts.blade.php b/resources/views/components/layouts/admin/scripts.blade.php
index 3afad24b9..84f19c3c7 100644
--- a/resources/views/components/layouts/admin/scripts.blade.php
+++ b/resources/views/components/layouts/admin/scripts.blade.php
@@ -31,12 +31,14 @@
         const menuBackground = document.querySelector(".js-menu-background");
         const menuClose = document.querySelector("[data-menu-close]");
 
+        //animation for notification icon
         if (document.querySelector('[data-menu="notifications-menu"]')) {
             setTimeout(function() {
                 document.querySelector('[data-menu="notifications-menu"]').classList.remove("animate-vibrate");
             }, 6000);
         }
 
+        //chevron active class action
         Array.from(detailsEL).forEach((el) => {
                 el.addEventListener("toggle", function(e) {
                     if (e.target.querySelector(".material-icons-outlined")) {
@@ -52,18 +54,21 @@
             }
         );
 
+        //container animation when left menu shrinking
         function contentTransitionLeft() {
             sectionContent.classList.add("xl:ltr:ml-0", "xl:rtl:mr-0");
             sectionContent.classList.remove("xl:ltr:ml-64", "xl:rtl:mr-64");
             toggleButton.querySelector("span").classList.add("ltr:-rotate-90", "rtl:rotate-90");
         }
 
+        //container animation when left menu unshrinking
         function contentTransitionRight() {
             sectionContent.classList.remove("xl:ltr:ml-0", "xl:rtl:mr-0");
             sectionContent.classList.add("xl:ltr:ml-64", "xl:rtl:mr-64");
             toggleButton.querySelector("span").classList.remove("ltr:-rotate-90", "rtl:rotate-90");
         }
 
+        //if there are notifications, remove count badge
         function notificationCount(action) {
             let notification_count = document.querySelector('[data-notification-count]');
 
@@ -72,6 +77,7 @@
             }
         }
 
+        //slide menu actions together responsive version
         function slideMenu() {
             if (document.body.clientWidth <= 1280) {
                 mobileMenuHidden();
@@ -99,10 +105,12 @@
             slideMenu();
         });
 
+        //general left menu actions (show settings menu etc..)
         function toggleMenu(iconButton, event) {
             const menuRef = iconButton.getAttribute("data-menu");
             const icon = iconButton.children[0].getAttribute("name");
 
+            //if event target, profile
             if (iconButton.getAttribute("data-menu") === "profile-menu") {
                 if (iconButton.children[0].textContent != "cancel") {
                     iconButton.children[0].classList.remove("hidden");
@@ -113,6 +121,7 @@
                 }
             }
 
+            //remove active (cancel text) class form target icon
             menuButtons.forEach((button) => {
                 if (icon) {
                     if (button.getAttribute("data-menu") !== menuRef && iconButton.children[0].textContent != "cancel") {
@@ -123,6 +132,7 @@
             });
 
             menus.forEach((menu) => {
+                //add active (cancel text) class form target icon
                 if (menu.classList.contains(menuRef) && iconButton.children[0].textContent != "cancel") {
                     iconButton.children[0].textContent = "cancel";
                     iconButton.children[0].classList.add("active");
@@ -135,6 +145,7 @@
 
                     notificationCount("none");
 
+                //remove active (cancel text) class form target icon
                 } else if (menu.classList.contains(menuRef) && iconButton.children[0].textContent == "cancel") {
                     iconButton.children[0].textContent = icon;
                     iconButton.children[0].classList.remove("active");
@@ -146,12 +157,13 @@
                     menuClose.classList.add("hidden");
 
                     notificationCount("flex");
-
+                //left menu slide to left
                 } else {
                     menu.classList.add("ltr:-left-80", "rtl:-right-80");
                     menu.classList.remove("ltr:left-14", "rtl:right-14");
                 }
 
+                //close icon click event
                 menuClose.addEventListener("click", function() {
                     menu.classList.add("ltr:-left-80", "rtl:-right-80");
                     menu.classList.remove("ltr:left-14", "rtl:right-14");
@@ -165,6 +177,7 @@
         }
 
         if (document.body.clientWidth >= 1280) {
+            //if url have profile menu, profile menu show
             if (is_profile_menu == 1) {
                 let profile_menu_html = document.querySelector(".profile-menu");
                 let profile_icon_html = document.querySelector("[data-menu='profile-menu']");
@@ -180,6 +193,7 @@
                 toggleButton.classList.add("invisible");
             }
 
+            //if url have settings menu, settings menu show
             if (is_settings_menu == 1) {
                 let settings_menu_html = document.querySelector(".settings-menu");
                 let settings_icon_html = document.querySelector("[data-menu='settings-menu']");
@@ -193,6 +207,7 @@
             }
         }
 
+        //if mobile menu, menu is active
         function mobileMenuActive() {
             navbarMenu.classList.add("ltr:left-0", "rtl:right-0");
             navbarMenu.classList.remove("ltr:-left-80", "rtl:-right-80");
@@ -201,6 +216,7 @@
             menuBackground.classList.remove("invisible");
         }
 
+        //if mobile menu, menu is hidden
         function mobileMenuHidden() {
             navbarMenu.classList.remove("ltr:left-0", "rtl:right-0");
             navbarMenu.classList.add("ltr:-left-80", "rtl:-right:80");
diff --git a/resources/views/components/layouts/portal/scripts.blade.php b/resources/views/components/layouts/portal/scripts.blade.php
index 71c9a68a5..33a36c78f 100644
--- a/resources/views/components/layouts/portal/scripts.blade.php
+++ b/resources/views/components/layouts/portal/scripts.blade.php
@@ -31,12 +31,14 @@
         const menuBackground = document.querySelector(".js-menu-background");
         const menuClose = document.querySelector("[data-menu-close]");
 
+        //animation for notification icon
         if (document.querySelector('[data-menu="notifications-menu"]')) {
             setTimeout(function() {
                 document.querySelector('[data-menu="notifications-menu"]').classList.remove("animate-vibrate");
             }, 6000);
         }
 
+        //chevron active class action
         Array.from(detailsEL).forEach((el) => {
                 el.addEventListener("toggle", function(e) {
                     if(e.target.querySelector(".material-icons-outlined")) {
@@ -48,18 +50,21 @@
             }
         );
 
+        //container animation when left menu shrinking
         function contentTransitionLeft() {
             sectionContent.classList.add("xl:ltr:ml-0", "xl:rtl:mr-0");
             sectionContent.classList.remove("xl:ltr:ml-64", "xl:rtl:mr-64");
             toggleButton.querySelector("span").classList.add("ltr:-rotate-90", "rtl:rotate-90");
         }
 
+        //container animation when left menu unshrinking
         function contentTransitionRight() {
             sectionContent.classList.remove("xl:ltr:ml-0", "xl:rtl:mr-0");
             sectionContent.classList.add("xl:ltr:ml-64", "xl:rtl:mr-64");
             toggleButton.querySelector("span").classList.remove("ltr:-rotate-90", "rtl:rotate-90");
         }
 
+        //slide menu actions together responsive version
         function slideMenu() {
             if (document.body.clientWidth <= 1280) {
                 mobileMenuHidden();
@@ -87,10 +92,12 @@
             slideMenu();
         });
 
+        //general left menu actions (show settings menu etc..)
         function toggleMenu(iconButton, event) {
             const menuRef = iconButton.getAttribute("data-menu");
             const icon = iconButton.children[0].getAttribute("name");
 
+            //if event target, profile
             if (iconButton.getAttribute("data-menu") === "profile-menu") {
                 if (iconButton.children[0].textContent != "cancel") {
                     iconButton.children[0].classList.remove("hidden");
@@ -101,6 +108,7 @@
                 }
             }
 
+            //remove active (cancel text) class form target icon
             menuButtons.forEach((button) => {
                 if (icon) {
                     if (button.getAttribute("data-menu") !== menuRef && iconButton.children[0].textContent != "cancel") {
@@ -111,6 +119,7 @@
             });
 
             menus.forEach((menu) => {
+                //add active (cancel text) class form target icon
                 if (menu.classList.contains(menuRef) && iconButton.children[0].textContent != "cancel") {
                     iconButton.children[0].textContent = "cancel";
                     iconButton.children[0].classList.add("active");
@@ -121,6 +130,7 @@
                     toggleButton.classList.add("invisible");
                     menuClose.classList.remove("hidden");
 
+                //remove active (cancel text) class form target icon
                 } else if (menu.classList.contains(menuRef) && iconButton.children[0].textContent == "cancel") {
                     iconButton.children[0].textContent = icon;
                     iconButton.children[0].classList.remove("active");
@@ -130,11 +140,13 @@
                     mainContent.classList.remove("hidden");
                     toggleButton.classList.remove("invisible");
                     menuClose.classList.add("hidden");
+                //left menu slide to left
                 } else {
                     menu.classList.add("ltr:-left-80", "rtl:-right-80");
                     menu.classList.remove("ltr:left-14", "rtl:right-14");
                 }
 
+                //close icon click event
                 menuClose.addEventListener("click", function() {
                     menu.classList.add("ltr:-left-80", "rtl:-right-80");
                     iconButton.children[0].textContent = icon;
@@ -147,6 +159,7 @@
         }
 
         if (document.body.clientWidth >= 1280) {
+            //if url have profile menu, profile menu show
             if (is_profile_menu == 1) {
                 let profile_menu_html = document.querySelector(".profile-menu");
                 let profile_icon_html = document.querySelector("[data-menu='profile-menu']");
@@ -164,6 +177,7 @@
             }
         }
 
+        //if mobile menu, menu is active
         function mobileMenuActive() {
             navbarMenu.classList.add("ltr:left-0", "rtl:right-0");
             navbarMenu.classList.remove("ltr:-left-80", "rtl:-right-80");
@@ -172,6 +186,7 @@
             menuBackground.classList.remove("invisible");
         }
 
+        //if mobile menu, menu is hidden
         function mobileMenuHidden() {
             navbarMenu.classList.remove("ltr:left-0", "rtl:right-0");
             navbarMenu.classList.add("ltr:-left-80", "rtl:-right:80");

From 1c9068cfa99a0edab1d4521c0fbc5ffad9f85e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 20 Jun 2022 16:17:38 +0300
Subject: [PATCH 2/5] Skip date column for SearchString

---
 app/View/Components/SearchString.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/View/Components/SearchString.php b/app/View/Components/SearchString.php
index ae524cb70..394bf023e 100644
--- a/app/View/Components/SearchString.php
+++ b/app/View/Components/SearchString.php
@@ -18,6 +18,11 @@ class SearchString extends Component
     /** string */
     public $model;
 
+    public $skip_columns = [
+        'created_at',
+        'updated_at',
+    ];
+
     /**
      * Create a new component instance.
      *
@@ -47,7 +52,12 @@ class SearchString extends Component
 
                 foreach ($columns as $column => $options) {
                     // This column skip for filter
-                    if (!empty($options['searchable'])) {
+                    if (! empty($options['searchable'])) {
+                        continue;
+                    }
+
+                    // This column skip for filter
+                    if (in_array($column, $this->skip_columns)) {
                         continue;
                     }
 

From 612e15fb995eb3cccb9d9a19d2773c102f2702a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Mon, 20 Jun 2022 18:38:29 +0300
Subject: [PATCH 3/5] dont detach on soft-delete

---
 app/Jobs/Common/DeleteCompany.php   | 2 --
 app/Jobs/Common/DeleteDashboard.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app/Jobs/Common/DeleteCompany.php b/app/Jobs/Common/DeleteCompany.php
index 2a3647ff7..c456b7aad 100644
--- a/app/Jobs/Common/DeleteCompany.php
+++ b/app/Jobs/Common/DeleteCompany.php
@@ -34,8 +34,6 @@ class DeleteCompany extends Job implements ShouldDelete
                 'recurring', 'reports', 'settings', 'taxes', 'transactions', 'transfers', 'widgets',
             ]);
 
-            $this->model->users()->detach();
-
             $this->model->delete();
         });
 
diff --git a/app/Jobs/Common/DeleteDashboard.php b/app/Jobs/Common/DeleteDashboard.php
index 67a5d42e5..729582b7c 100644
--- a/app/Jobs/Common/DeleteDashboard.php
+++ b/app/Jobs/Common/DeleteDashboard.php
@@ -19,8 +19,6 @@ class DeleteDashboard extends Job implements ShouldDelete
         \DB::transaction(function () {
             $this->deleteRelationships($this->model, ['widgets']);
 
-            $this->model->users()->detach();
-
             $this->model->delete();
         });
 

From 21cf287998eaf2c7a1b15be090c04eae3ab7a502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 20 Jun 2022 18:41:12 +0300
Subject: [PATCH 4/5] Fixed widget and report alias issue.. ( #32baajc )

---
 app/Utilities/Reports.php | 2 +-
 app/Utilities/Widgets.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Utilities/Reports.php b/app/Utilities/Reports.php
index 67b0f45fb..05a5dec1f 100644
--- a/app/Utilities/Reports.php
+++ b/app/Utilities/Reports.php
@@ -54,7 +54,7 @@ class Reports
             return false;
         }
 
-        if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
+        if (! empty($model) && ($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
             return false;
         }
 
diff --git a/app/Utilities/Widgets.php b/app/Utilities/Widgets.php
index b9a97a7e4..7d2ebc04b 100644
--- a/app/Utilities/Widgets.php
+++ b/app/Utilities/Widgets.php
@@ -65,7 +65,7 @@ class Widgets
 
             $model = Widget::where('dashboard_id', session('dashboard_id'))->where('class', $class_name)->first();
 
-            if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
+            if (! empty($model) && ($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
                 return false;
             }
 

From ae55e4eb0674e8eb5d4d3111229c66d965008ed8 Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Tue, 21 Jun 2022 15:55:06 +0300
Subject: [PATCH 5/5] seach text development when options select

---
 .../assets/js/components/AkauntingSearch.vue  | 37 +++++++++++++++----
 resources/lang/en-GB/general.php              |  2 +
 .../views/components/search-string.blade.php  |  2 +
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSearch.vue b/resources/assets/js/components/AkauntingSearch.vue
index 14d509fd9..2c27fe295 100644
--- a/resources/assets/js/components/AkauntingSearch.vue
+++ b/resources/assets/js/components/AkauntingSearch.vue
@@ -31,9 +31,9 @@
             <input
             v-if="!show_date"
             type="text"
-            class="w-full bg-transparent text-black text-sm border-0 px-10 pb-0 focus:outline-none focus:ring-transparent focus:border-purple-100"
-            :class="[{'px-4' : !show_icon}]"
-            :placeholder="placeholder"
+            class="w-full bg-transparent text-black text-sm border-0 pb-0 focus:outline-none focus:ring-transparent focus:border-purple-100"
+            :class="!show_icon ? 'px-4' : 'px-10'"
+            :placeholder="dynamicPlaceholder"
             :ref="'input-search-field-' + _uid"
             v-model="search"
             @focus="onInputFocus"
@@ -47,8 +47,9 @@
                 @on-open="onInputFocus"
                 @blur="onBlur"
                 :config="dateConfig"
-                class="w-full bg-transparent text-black text-sm border-0 px-10 pb-0 focus:outline-none focus:ring-transparent focus:border-purple-100 datepicker"
-                :placeholder="placeholder"
+                class="w-full bg-transparent text-black text-sm border-0 pb-0 focus:outline-none focus:ring-transparent focus:border-purple-100 datepicker"
+                :class="!show_icon ? 'px-4' : 'px-10'"
+                :placeholder="dynamicPlaceholder"
                 :ref="'input-search-date-field-' + _uid"
                 value=""
                 @focus="onInputFocus"
@@ -56,7 +57,13 @@
                 @keyup.enter="onInputConfirm"
             >
             </flat-picker>
-                <span class="material-icons absolute bottom-1 ltr:left-3 rtl:right-3 text-lg text-black" style="z-index:-1;">search</span>
+                <span
+                    v-if="show_icon"
+                    class="material-icons absolute bottom-1 ltr:left-3 rtl:right-3 text-lg text-black"
+                    style="z-index:-1;"
+                >
+                    search
+                </span>
 
             <button type="button" class="absolute ltr:right-0 rtl:left-0 top-2 clear" v-if="show_close_icon" @click="onSearchAndFilterClear">
                 <span class="material-icons text-sm">close</span>
@@ -126,6 +133,12 @@ export default {
             default: 'Search or filter results...',
             description: 'Input placeholder'
         },
+        selectPlaceholder: {
+            type: String,
+        },
+        enterPlaceholder: {
+            type: String,
+        },
         searchText: {
             type: String,
             default: 'Search for this text',
@@ -200,7 +213,9 @@ export default {
             show_close_icon: false,
             show_icon: true,
             equal_image: app_url +  "/public/img/tailwind_icons/not-equal.svg",
-            input_focus: false
+            input_focus: false,
+            defaultPlaceholder: this.placeholder,
+            dynamicPlaceholder: this.placeholder,
         };
     },
 
@@ -373,6 +388,8 @@ export default {
             this.show_icon = false;
             this.current_value = value;
             this.range = false;
+            
+            this.dynamicPlaceholder = this.selectPlaceholder;
 
             let option = false;
             let option_url = false;
@@ -505,6 +522,8 @@ export default {
             this.show_close_icon = true;
             let select_value = false;
 
+            this.dynamicPlaceholder = this.enterPlaceholder;
+
             for (let i = 0; i < this.values.length; i++) {
                 if (this.values[i].key == value) {
                     select_value = this.values[i].value;
@@ -561,6 +580,10 @@ export default {
             this.selected_values.splice(index, 1);
 
             this.show_date = false;
+            
+            if (this.filter_index == 0) {
+                this.dynamicPlaceholder = this.defaultPlaceholder;
+            }
 
             this.filter_last_step = 'options';
         },
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index e71adf063..5c54baa21 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -270,6 +270,8 @@ return [
     'placeholder' => [
         'search'            => 'Type to search..',
         'search_and_filter' => 'Search or filter results..',
+        'select_and_filter' => 'Select one of the available options below',
+        'enter_and_filter'  => 'Hit enter to filter the results, or set a new filter',
         'contact_search'    => 'Type a :type name',
         'item_search'       => 'Type an item name',
     ],
diff --git a/resources/views/components/search-string.blade.php b/resources/views/components/search-string.blade.php
index c7b3f7330..66c4d73e2 100644
--- a/resources/views/components/search-string.blade.php
+++ b/resources/views/components/search-string.blade.php
@@ -1,5 +1,7 @@
 <akaunting-search
     placeholder="{{ (!empty($filters)) ? trans('general.placeholder.search_and_filter') : trans('general.search_placeholder')}}"
+    select-placeholder="{{ trans('general.placeholder.select_and_filter') }}"
+    enter-placeholder="{{ trans('general.placeholder.enter_and_filter') }}"
     search-text="{{ trans('general.search_text') }}"
     operator-is-text="{{ trans('general.is') }}"
     operator-is-not-text="{{ trans('general.isnot') }}"