Changeset 3212261
- Timestamp:
- 12/23/2024 04:37:25 PM (15 months ago)
- Location:
- mareike
- Files:
-
- 8 edited
- 1 copied
-
tags/3.6 (copied) (copied from mareike/trunk)
-
tags/3.6/app/controllers/invoices/class-userinvoices.php (modified) (1 diff)
-
tags/3.6/install/database/invoice.sql (modified) (1 diff)
-
tags/3.6/mareike.php (modified) (1 diff)
-
tags/3.6/readme.txt (modified) (2 diffs)
-
trunk/app/controllers/invoices/class-userinvoices.php (modified) (1 diff)
-
trunk/install/database/invoice.sql (modified) (1 diff)
-
trunk/mareike.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
mareike/tags/3.6/app/controllers/invoices/class-userinvoices.php
r3211566 r3212261 42 42 private function print_new_invoices() { 43 43 $invoices = GetUserInvoices::get_new_invoices(get_current_user_id()); 44 mareike_print_myinvoices_list( 'NEW', $invoices, $this->calc_total_amount($invoices));44 mareike_print_myinvoices_list(Invoice::$INVOICE_STATUS_NEW, $invoices, $this->calc_total_amount($invoices)); 45 45 } 46 46 47 47 private function print_approved_invoices() { 48 48 $invoices = GetUserInvoices::get_approved_invoices(get_current_user_id()); 49 mareike_print_myinvoices_list(Invoice::$INVOICE_STATUS_APPROVED, $invoices, $this->calc_total_amount($invoices)); 49 50 } 50 51 51 52 private function print_denied_invoices() { 52 53 $invoices = GetUserInvoices::get_denied_invoices(get_current_user_id()); 54 mareike_print_myinvoices_list(Invoice::$INVOICE_STATUS_DENIED, $invoices, $this->calc_total_amount($invoices)); 53 55 } 54 56 -
mareike/tags/3.6/install/database/invoice.sql
r3211566 r3212261 7 7 `costunit_id` bigint UNSIGNED NOT NULL, 8 8 `lfd_nummer` int NOT NULL, 9 `status` ENUM('APPROVED','DENIED','EXPORTED','NOPAYOUT','NEW' ) NOT NULL DEFAULT 'NEW',9 `status` ENUM('APPROVED','DENIED','EXPORTED','NOPAYOUT','NEW', 'DENIED_EXPORTED') NOT NULL DEFAULT 'NEW', 10 10 `user_id` bigint UNSIGNED DEFAULT NULL, 11 11 `contact_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, -
mareike/tags/3.6/mareike.php
r3211905 r3212261 3 3 * Plugin Name: mareike 4 4 * Description: A tool to help associations to manage travel or material costs for events or ongoing jobs. 5 * Version: 3. 55 * Version: 3.6 6 6 * Tags: mareike, administration, fincance, travelmanagement, association tool 7 7 * Requires at least: 6.0 -
mareike/tags/3.6/readme.txt
r3211905 r3212261 4 4 Requires at least: 6.0 5 5 Tested up to: 6.7 6 Stable tag: 3. 56 Stable tag: 3.6 7 7 License: GPLv3 8 8 License URI: http://www.gnu.org/licenses/gpl-3.0.html … … 39 39 40 40 ## Changelog ## 41 = 3.6 = 42 * [IMP] Improved usability for user invoices 43 41 44 = 3.5 = 42 45 * [BUG] Fixed file linking -
mareike/trunk/app/controllers/invoices/class-userinvoices.php
r3211566 r3212261 42 42 private function print_new_invoices() { 43 43 $invoices = GetUserInvoices::get_new_invoices(get_current_user_id()); 44 mareike_print_myinvoices_list( 'NEW', $invoices, $this->calc_total_amount($invoices));44 mareike_print_myinvoices_list(Invoice::$INVOICE_STATUS_NEW, $invoices, $this->calc_total_amount($invoices)); 45 45 } 46 46 47 47 private function print_approved_invoices() { 48 48 $invoices = GetUserInvoices::get_approved_invoices(get_current_user_id()); 49 mareike_print_myinvoices_list(Invoice::$INVOICE_STATUS_APPROVED, $invoices, $this->calc_total_amount($invoices)); 49 50 } 50 51 51 52 private function print_denied_invoices() { 52 53 $invoices = GetUserInvoices::get_denied_invoices(get_current_user_id()); 54 mareike_print_myinvoices_list(Invoice::$INVOICE_STATUS_DENIED, $invoices, $this->calc_total_amount($invoices)); 53 55 } 54 56 -
mareike/trunk/install/database/invoice.sql
r3211566 r3212261 7 7 `costunit_id` bigint UNSIGNED NOT NULL, 8 8 `lfd_nummer` int NOT NULL, 9 `status` ENUM('APPROVED','DENIED','EXPORTED','NOPAYOUT','NEW' ) NOT NULL DEFAULT 'NEW',9 `status` ENUM('APPROVED','DENIED','EXPORTED','NOPAYOUT','NEW', 'DENIED_EXPORTED') NOT NULL DEFAULT 'NEW', 10 10 `user_id` bigint UNSIGNED DEFAULT NULL, 11 11 `contact_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, -
mareike/trunk/mareike.php
r3211905 r3212261 3 3 * Plugin Name: mareike 4 4 * Description: A tool to help associations to manage travel or material costs for events or ongoing jobs. 5 * Version: 3. 55 * Version: 3.6 6 6 * Tags: mareike, administration, fincance, travelmanagement, association tool 7 7 * Requires at least: 6.0 -
mareike/trunk/readme.txt
r3211905 r3212261 4 4 Requires at least: 6.0 5 5 Tested up to: 6.7 6 Stable tag: 3. 56 Stable tag: 3.6 7 7 License: GPLv3 8 8 License URI: http://www.gnu.org/licenses/gpl-3.0.html … … 39 39 40 40 ## Changelog ## 41 = 3.6 = 42 * [IMP] Improved usability for user invoices 43 41 44 = 3.5 = 42 45 * [BUG] Fixed file linking
Note: See TracChangeset
for help on using the changeset viewer.