Merge branch '1607-transaction-list---change-date-display-and-add-col…

…umn-sorting' into staging
younginnovations · Nov 28, 2024 · ead8993 · ead8993
2 parents a2d31b0 + ff75c5d
commit ead8993
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/app/IATI/Repositories/Activity/TransactionRepository.php b/app/IATI/Repositories/Activity/TransactionRepository.php
@@ -56,11 +56,11 @@ public function getPaginatedTransaction(int $activityId, array $queryParams, int
                 'type'  => $query->orderByRaw("(transaction->'transaction_type'->0->>'transaction_type_code')::INTEGER $direction, created_at DESC"),
                 'value' => $query->orderByRaw("(transaction->'value'->0->>'amount')::NUMERIC $direction, created_at DESC"),
                 'date'  => $query->orderByRaw("(transaction->'transaction_date'->0->>'date')::DATE $direction, created_at DESC"),
-                default => $query->orderBy('created_at', 'desc')->orderBy('id', 'desc'),
+                default => $query->orderBy('created_at', 'desc'),
             };
         });
 
-        return $query->paginate($limit, ['*'], 'transaction', $page);
+        return $query->orderBy('id', 'desc')->paginate($limit, ['*'], 'transaction', $page);
     }
 
     /**

diff --git a/resources/assets/sass/component/_input.scss b/resources/assets/sass/component/_input.scss
@@ -256,41 +256,41 @@ label {
 }
 
 select.select2.default-value-indicator
-  + .select2
-  .selection
-  .select2-selection:not(:focus) {
++ .select2
+.selection
+.select2-selection:not(:focus) {
   border: 2px solid #3f9a7c;
   background-color: #3f9a7c15;
 }
 
 select.select2.default-value-indicator
-  + .select2
-  .selection
-  .select2-selection:not(:focus) {
++ .select2
+.selection
+.select2-selection:not(:focus) {
   border: 2px solid #3f9a7c;
   background-color: #3f9a7c15;
 }
 
 select.select2.default-value-indicator
-  + .select2
-  .selection
-  .select2-selection
-  .select2-selection__placeholder {
++ .select2
+.selection
+.select2-selection
+.select2-selection__placeholder {
   color: var(--bluecoral-50);
 }
 
 select.select2.default-value-indicator
-  + .select2.select2-container--open
-  .selection
-  .select2-selection {
++ .select2.select2-container--open
+.selection
+.select2-selection {
   border: 1px solid #a6b5ba;
   background-color: white;
 }
 
 select.select2.default-value-indicator
-  + .select2
-  .selection
-  .select2-selection.select2-selection--clearable {
++ .select2
+.selection
+.select2-selection.select2-selection--clearable {
   border: 1px solid #a6b5ba;
   background-color: white;
 }