From 8703a5e784497f6e83eb3bd90caf80c5ee913796 Mon Sep 17 00:00:00 2001
From: akito-38 <m.akirabo@gmail.com>
Date: Tue, 22 Oct 2024 21:43:31 +0900
Subject: [PATCH 1/3] =?UTF-8?q?add=EF=BC=9A[=E3=82=AB=E3=82=B9=E3=82=BF?=
 =?UTF-8?q?=E3=83=A0=E5=88=86=E9=A1=9E=E3=83=AA=E3=82=B9=E3=83=88=20?=
 =?UTF-8?q?=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83=E3=83=88=20]=20?=
 =?UTF-8?q?=E6=98=87=E9=A0=86=E3=83=BB=E9=99=8D=E9=A0=86=E3=82=92=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/other-widget/widget-taxonomies.php | 25 ++++++++++++++++++++-----
 readme.txt                             |  6 ++++--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/inc/other-widget/widget-taxonomies.php b/inc/other-widget/widget-taxonomies.php
index 711683ec..2ac24bf6 100644
--- a/inc/other-widget/widget-taxonomies.php
+++ b/inc/other-widget/widget-taxonomies.php
@@ -22,7 +22,7 @@ public static function veu_widget_description() {
 
 	function widget( $args, $instance ) {
 		$instance = static::get_defaults( $instance );
-		
+
 		if ( ! isset( $instance['tax_name'] ) ) {
 			$instance['tax_name'] = 'category';
 		}
@@ -32,9 +32,11 @@ function widget( $args, $instance ) {
 		if ( ! isset( $instance['form_design'] ) ) {
 			$instance['form_design'] = 'list';
 		}
+		if ( ! isset( $instance['form_sort'] ) ) {
+			$instance['form_sort'] = 'asc';
+		}
 
 
-		
 		?>
 		<?php echo $args['before_widget']; ?>
 		<div class="sideWidget widget_taxonomies widget_nav_menu">
@@ -53,6 +55,8 @@ function widget( $args, $instance ) {
 						'hierarchical'    => true,
 						'title_li'        => '',
 						'taxonomy'        => $instance['tax_name'],
+						'orderby'         => 'title',
+						'order'           => $instance['form_sort']
 					);
 					$tax_args = apply_filters( 'veu_widget_taxlist_args', $tax_args ); // 9.13.0.0
 
@@ -76,6 +80,8 @@ function widget( $args, $instance ) {
 						'taxonomy'          => $instance['tax_name'],
 						'name'              => $name,
 						'value_field'       => 'slug',
+						'orderby'           => 'title',
+						'order'             => $instance['form_sort']
 					);
 					$tax_args = apply_filters( 'veu_widget_taxlist_args', $tax_args ); //
 
@@ -106,7 +112,7 @@ public static function get_defaults( $instance = array() ) {
 	function form( $instance ) {
 		$instance = static::get_defaults( $instance );
 		$taxs     = get_taxonomies( array( 'public' => true ), 'objects' );
-		?>
+?>
 
 		<!-- タイトル -->
 		<div style="margin-top:15px;">
@@ -140,7 +146,15 @@ function form( $instance ) {
 		<input style="margin-top:3px" type="checkbox" id="<?php echo $this->get_field_id( 'hide_empty' ); ?>" name="<?php echo $this->get_field_name( 'hide_empty' ); ?>" value="true"<?php if ( $instance['hide_empty'] ) { echo ' checked';} ?>
  />
 		<label for="<?php echo $this->get_field_id( 'hide_empty' ); ?>"><?php _e( 'Do not display terms without posts', 'vk-all-in-one-expansion-unit' ); ?></label>
-		</p>
+
+		<!-- [ Form sort ] -->
+		<div>
+			<label for="<?php echo $this->get_field_id( 'form_sort' ); ?>">Display order:</label>
+			<select name="<?php echo $this->get_field_name( 'form_sort' ); ?>" class="admin-custom-input">
+				<option value="asc" <?php selected( $instance['form_sort'], 'asc' ); ?>>ascending order</option>
+				<option value="desc" <?php selected( $instance['form_sort'], 'desc' ); ?>>descending order</option>
+			</select>
+		</div>
 
 		<script type="text/javascript">
 		jQuery(document).ready(function($){
@@ -178,6 +192,7 @@ function update( $new_instance, $old_instance ) {
 
 		$instance['form_design'] = $new_instance['form_design'];
 
+		$instance['form_sort'] = $new_instance['form_sort'];
 		return $instance;
 	}
 }
@@ -190,4 +205,4 @@ function( $options ) {
 	},
 	10,
 	1
-);
\ No newline at end of file
+);
diff --git a/readme.txt b/readme.txt
index d63699ac..eea4945f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -81,6 +81,8 @@ e.g.
 
 == Changelog ==
 
+[ Add setting ][ Category list ] Enable to specify ascending/descending order
+
 = 9.99.6 =
 [ Bug fix ][ Child Page List ] Fixed an issue related to a PHP error.
 
@@ -102,7 +104,7 @@ e.g.
 
 = 9.99.0 =
 [ Specification Change ][ Page top button ] Add #top on body for pagetop btn
-[ Specification Change ][ Taxonomy Widget ] Add dropdown mode. 
+[ Specification Change ][ Taxonomy Widget ] Add dropdown mode.
 [ Specification Change ] Foce Load JS from footer is abolished.
 [ Fix ] Add a title attribute on Google Tag Manager (noscript)
 [ Bug fix ] Fix XSS of Widgets, CTA, Custom Post Type Manager.
@@ -130,7 +132,7 @@ e.g.
 [ Add setting ][ Post Type Manager ] Add a custom field setting.
 [ Specification Change ][ Post Type Manager ] Change so that "with_front" can be specified as false in permalink settings
 [ Bug Fix ][ SNS ] Fix OGP description on password protected page.
-[ Bug Fix ][ Contact Section ] Fixed an issue where icons do not display when input in <i> tag format. 
+[ Bug Fix ][ Contact Section ] Fixed an issue where icons do not display when input in <i> tag format.
 [ Design Bug Fix ][ Child Page List ] Fixed an issue where a blank space appeared above the excerpt.
 
 = 9.95.0 =

From 26e9875e55010afb6dc8a9f78798cb4a11d3b402 Mon Sep 17 00:00:00 2001
From: akito-38 <m.akirabo@gmail.com>
Date: Mon, 28 Oct 2024 22:33:39 +0900
Subject: [PATCH 2/3] =?UTF-8?q?order=E3=81=AEtitle=E3=82=92name=E3=81=AB?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/other-widget/widget-taxonomies.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/inc/other-widget/widget-taxonomies.php b/inc/other-widget/widget-taxonomies.php
index 2ac24bf6..978005e3 100644
--- a/inc/other-widget/widget-taxonomies.php
+++ b/inc/other-widget/widget-taxonomies.php
@@ -35,9 +35,7 @@ function widget( $args, $instance ) {
 		if ( ! isset( $instance['form_sort'] ) ) {
 			$instance['form_sort'] = 'asc';
 		}
-
-
-		?>
+	?>
 		<?php echo $args['before_widget']; ?>
 		<div class="sideWidget widget_taxonomies widget_nav_menu">
 			<?php echo $args['before_title'] . $instance['label'] . $args['after_title']; ?>
@@ -55,7 +53,7 @@ function widget( $args, $instance ) {
 						'hierarchical'    => true,
 						'title_li'        => '',
 						'taxonomy'        => $instance['tax_name'],
-						'orderby'         => 'title',
+						'orderby'         => 'name',
 						'order'           => $instance['form_sort']
 					);
 					$tax_args = apply_filters( 'veu_widget_taxlist_args', $tax_args ); // 9.13.0.0
@@ -80,7 +78,7 @@ function widget( $args, $instance ) {
 						'taxonomy'          => $instance['tax_name'],
 						'name'              => $name,
 						'value_field'       => 'slug',
-						'orderby'           => 'title',
+						'orderby'           => 'name',
 						'order'             => $instance['form_sort']
 					);
 					$tax_args = apply_filters( 'veu_widget_taxlist_args', $tax_args ); //

From b3cc5976501db83230b21d9c2be02d7b01cd2bb2 Mon Sep 17 00:00:00 2001
From: kurudrive <kurudrive@gmail.com>
Date: Tue, 29 Oct 2024 03:03:42 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E8=A1=A8=E8=A8=98=E5=90=8D=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/other-widget/widget-taxonomies.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/other-widget/widget-taxonomies.php b/inc/other-widget/widget-taxonomies.php
index 978005e3..a65ac4f1 100644
--- a/inc/other-widget/widget-taxonomies.php
+++ b/inc/other-widget/widget-taxonomies.php
@@ -149,8 +149,8 @@ function form( $instance ) {
 		<div>
 			<label for="<?php echo $this->get_field_id( 'form_sort' ); ?>">Display order:</label>
 			<select name="<?php echo $this->get_field_name( 'form_sort' ); ?>" class="admin-custom-input">
-				<option value="asc" <?php selected( $instance['form_sort'], 'asc' ); ?>>ascending order</option>
-				<option value="desc" <?php selected( $instance['form_sort'], 'desc' ); ?>>descending order</option>
+				<option value="asc" <?php selected( $instance['form_sort'], 'asc' ); ?>><?php _e('Ascending Order ( A → Z )','vk-all-in-one-expansion-unit');?></option>
+				<option value="desc" <?php selected( $instance['form_sort'], 'desc' ); ?>><?php _e('Descending Order ( Z → A )','vk-all-in-one-expansion-unit');?></option>
 			</select>
 		</div>