Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changelogs/combined-orders-transactions-view.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
significance: minor
type: changed
entry: Orders now lists transactions (and free orders) with a separate
Subscriptions listing, allowing export of transactions and subscriptions to
csv.
5 changes: 5 additions & 0 deletions .changelogs/orders-transactions-has-transaction-flag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
significance: patch
type: performance
entry: Replaced the unbounded order exclusion list in the Orders & Transactions
report with an indexed `_llms_has_transaction` order flag, backfilled via a
batched background migration, for better performance on large stores.
3 changes: 3 additions & 0 deletions .changelogs/student-subscriptions-and-receipts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
significance: minor
type: added
entry: Adds a "My Subscriptions" student dashboard tab and per-transaction receipt downloads.
11 changes: 10 additions & 1 deletion assets/js/llms-admin-tables.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,21 @@

this.change_filter = function( $table, $select ) {

this.reload( $table, {
var args = {
filter: $select.val(),
filterby: $select.attr( 'name' ),
page: 1,
};

// Also pass every filter's current value keyed by its name so tables that
// support multiple simultaneous filters (e.g. orders/transactions) can combine
// them. Tables using the single filter/filterby mechanism ignore the extras.
$table.parent().find( '.llms-table-filters select.llms-table-filter' ).each( function() {
args[ $( this ).attr( 'name' ) ] = $( this ).val();
} );

this.reload( $table, args );

};

/**
Expand Down
17 changes: 17 additions & 0 deletions assets/scss/admin/_llms-table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
border-bottom: 1px solid #c3c4c7;
padding: 10px 12px;
text-align: center;
vertical-align: top;

&.expandable.closed {
display: none;
Expand Down Expand Up @@ -224,3 +225,19 @@
text-align: left;
}
}

// Orders & Transactions and Subscriptions tables: left-align text, right-align monetary columns.
.llms-gb-table-orders_transactions,
.llms-gb-table-subscriptions {
td,
th {
text-align: left;
}

td.amount,
th.amount,
td.revenue,
th.revenue {
text-align: right;
}
}
27 changes: 26 additions & 1 deletion assets/scss/admin/post-tables/_llms_orders.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,32 @@
.wp-list-table {
.wp-list-table,
.llms-orders-transactions-wrap,
.llms-subscriptions-wrap {
@include order_status_badges();
}

#lifterlms-order-transactions .llms-table tfoot th {
text-align: right;
}

// New Orders / Subscriptions reporting pages (LLMS_Admin_Page_Orders).
.llms-orders-transactions-wrap,
.llms-subscriptions-wrap {

.llms-table-header {
align-items: center;
display: flex;
flex-wrap: wrap;
gap: 8px 12px;
margin: 12px 0 16px;
}

.llms-table-search {
margin-left: auto;
}

.llms-table-filters {
display: flex;
flex-wrap: wrap;
gap: 8px;
}
}
Loading
Loading