From d542a20f76232ecb9afd801625411efa113c4b91 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 7 Dec 2025 15:36:39 +0800 Subject: [PATCH 1/5] Fix district listing to display state info for clarity when 2 state share the same district name --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index de9d2122..12035f3b 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,14 @@ "flag-icon-css": "^3.5.0", "font-awesome": "^4.7.0", "intro.js": "^3.1.0", - "jquery": "^3.2", + "jquery": "^3.7.1", "jquery.scrollbar": "^0.2.11", "jwt-decode": "^3.1.2", "noty": "^3.2.0-beta", "perfect-scrollbar": "^1.5.0", "popper.js": "^1.12", "sass-loader": "10.1.0", - "select2": "^4.0.6-rc.1", + "select2": "^4.1.0-rc.0", "v-money": "^0.8.1", "vue": "^2.6.10", "vue-avatar": "^2.1.8", From a20f4ed9bed73700fcf53491fa0676238bf864d0 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 7 Dec 2025 15:50:19 +0800 Subject: [PATCH 2/5] Fix district listing to display state info for clarity when 2 state share the same district name --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 12035f3b..de9d2122 100644 --- a/package.json +++ b/package.json @@ -19,14 +19,14 @@ "flag-icon-css": "^3.5.0", "font-awesome": "^4.7.0", "intro.js": "^3.1.0", - "jquery": "^3.7.1", + "jquery": "^3.2", "jquery.scrollbar": "^0.2.11", "jwt-decode": "^3.1.2", "noty": "^3.2.0-beta", "perfect-scrollbar": "^1.5.0", "popper.js": "^1.12", "sass-loader": "10.1.0", - "select2": "^4.1.0-rc.0", + "select2": "^4.0.6-rc.1", "v-money": "^0.8.1", "vue": "^2.6.10", "vue-avatar": "^2.1.8", From 9147a4cfeccedd87b5ab02ea3bad12bed2240a9c Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 7 Dec 2025 16:13:08 +0800 Subject: [PATCH 3/5] Fix district listing to display state info for clarity when 2 state share the same district name --- .../assets/vue/components/general/forms/SelectComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/general/forms/SelectComponent.vue b/resources/assets/vue/components/general/forms/SelectComponent.vue index 394ec13b..06ab7cb7 100644 --- a/resources/assets/vue/components/general/forms/SelectComponent.vue +++ b/resources/assets/vue/components/general/forms/SelectComponent.vue @@ -21,7 +21,7 @@ data: this.options, minimumResultsForSearch: 6, theme: 'bootstrap', - containerCssClass: 'form-control', + // containerCssClass: 'form-control', }).val(this.value).trigger("change").on('change', function(){ vm.$emit('input', this.value); }).on('select2:open', function(){ From 0538653bcab6a78dc72bb9e514e175179b423204 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 7 Dec 2025 16:52:20 +0800 Subject: [PATCH 4/5] Fix district listing to display state info for clarity when 2 state share the same district name --- .../assets/vue/components/general/forms/SelectComponent.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/assets/vue/components/general/forms/SelectComponent.vue b/resources/assets/vue/components/general/forms/SelectComponent.vue index 06ab7cb7..50190fd1 100644 --- a/resources/assets/vue/components/general/forms/SelectComponent.vue +++ b/resources/assets/vue/components/general/forms/SelectComponent.vue @@ -19,9 +19,10 @@ let vm = this; $(this.$el).select2({ data: this.options, - minimumResultsForSearch: 6, + minimumResultsForSearch: 0, theme: 'bootstrap', - // containerCssClass: 'form-control', + dropdownParent: $(this.$el).closest('.modal-content'), + containerCssClass: 'form-control', }).val(this.value).trigger("change").on('change', function(){ vm.$emit('input', this.value); }).on('select2:open', function(){ From db499bfecfa843e82c37ec8a5a6b375f559ac122 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sun, 7 Dec 2025 16:53:28 +0800 Subject: [PATCH 5/5] Fix district listing to display state info for clarity when 2 state share the same district name --- .../assets/vue/components/general/forms/SelectComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/general/forms/SelectComponent.vue b/resources/assets/vue/components/general/forms/SelectComponent.vue index 50190fd1..7c6a662a 100644 --- a/resources/assets/vue/components/general/forms/SelectComponent.vue +++ b/resources/assets/vue/components/general/forms/SelectComponent.vue @@ -19,7 +19,7 @@ let vm = this; $(this.$el).select2({ data: this.options, - minimumResultsForSearch: 0, + minimumResultsForSearch: 6, theme: 'bootstrap', dropdownParent: $(this.$el).closest('.modal-content'), containerCssClass: 'form-control',