WordPress.org
Get WordPress

Plugin Directory

Changeset 3263898


Ignore:
Timestamp:
03/29/2025 06:07:46 PM (12 months ago)
Author:
tidschi
Message:

Update to version 5.2 from GitHub

Location:
mareike
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • mareike/tags/5.2/app/controllers/invoices/class-createinvoice.php

    r3233121 r3263898  
    262262                        'contact_name'       => $contact_name,
    263263                        'contact_email'      => $email,
    264                         'contact_bank_owner' => $iban,
    265                         'contact_bank_iban'  => $account_owner,
     264                        'contact_bank_owner' => $account_owner,
     265                        'contact_bank_iban'  => $iban,
    266266                        'costunit_id'        => $cost_unit->id,
    267267                        'amount'             => $amount,

  • mareike/tags/5.2/app/requests/class-getcsvdatarequest.php

    r3233121 r3263898  
    4949
    5050        foreach ( $invoices as $invoice ) {
     51            $invoice_name = 'NOPAYOUT';
     52            $invoice_iban = 'NOPAYOUT';
     53
     54            if ( 'APPROVED' === $invoice->status ) {
     55                $invoice_iban = trim($invoice->contact_bank_iban);
     56                $invoice_name = trim($invoice->contact_bank_owner);
     57            }
     58
    5159            $csv_line = '"' . $invoice->lfd_nummer . '",';
    52             if ($invoice->stauts === Invoice::$INVOICE_STATUS_DENIED) {
     60            if ($invoice->status === Invoice::$INVOICE_STATUS_DENIED) {
    5361                $csv_line .= '"","","",""';
    5462                $invoice->status = Invoice::$INVOICE_STATUS_DENIED_EXPORTED;
    … …  
    5765                $csv_line .=
    5866                    '"' . $invoice->type . '",' .
    59                     '"' . $invoice->type . '",' .
    60                     '"' . ( 'APPROVED' === $invoice->status ? trim( $invoice->contact_bank_owner ) : 'NOPAYOUT' ) . '",' .
    61                     '"' . ( 'APPROVED' === $invoice->status ? trim( $invoice->contact_bank_iban ) : 'NOPAYOUT' ) . '",' .
     67                    '"' . $invoice_name . '",' .
     68                    '"' . $invoice_iban . '",' .
    6269                    '"' . mareike_format_amount( $invoice->amount ) . '"';
    6370            }
    … …  
    6875                $invoice->comment = 'NOPAYOUT';
    6976            }
    70 
    71             $invoice->save();
    7277        }
    7378

  • mareike/tags/5.2/mareike.php

    r3233126 r3263898  
    33 * Plugin Name:  mareike
    44 * Description: A tool to help associations to manage travel or material costs for events or ongoing jobs.
    5  * Version: 5.1
     5 * Version: 5.2
    66 * Tags: mareike, administration, fincance, travelmanagement, association tool
    77 * Requires at least: 6.0

  • mareike/tags/5.2/readme.txt

    r3233126 r3263898  
    44Requires at least: 6.0
    55Tested up to: 6.7
    6 Stable tag: 5.1
     6Stable tag: 5.2
    77License: GPLv3
    88License URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    3939
    4040## Changelog ##
     41= 5.2 =
     42* [BUG] Fixed saving name and iban of account owner for new invoices
     43* [BUG] Fixed CSV exports
     44* [BUG] Fixed handling denied invoices
     45
    4146= 5.1 =
    4247* [BUG] Fix in recognition of account data on multisites

  • mareike/trunk/app/controllers/invoices/class-createinvoice.php

    r3233121 r3263898  
    262262                        'contact_name'       => $contact_name,
    263263                        'contact_email'      => $email,
    264                         'contact_bank_owner' => $iban,
    265                         'contact_bank_iban'  => $account_owner,
     264                        'contact_bank_owner' => $account_owner,
     265                        'contact_bank_iban'  => $iban,
    266266                        'costunit_id'        => $cost_unit->id,
    267267                        'amount'             => $amount,

  • mareike/trunk/app/requests/class-getcsvdatarequest.php

    r3233121 r3263898  
    4949
    5050        foreach ( $invoices as $invoice ) {
     51            $invoice_name = 'NOPAYOUT';
     52            $invoice_iban = 'NOPAYOUT';
     53
     54            if ( 'APPROVED' === $invoice->status ) {
     55                $invoice_iban = trim($invoice->contact_bank_iban);
     56                $invoice_name = trim($invoice->contact_bank_owner);
     57            }
     58
    5159            $csv_line = '"' . $invoice->lfd_nummer . '",';
    52             if ($invoice->stauts === Invoice::$INVOICE_STATUS_DENIED) {
     60            if ($invoice->status === Invoice::$INVOICE_STATUS_DENIED) {
    5361                $csv_line .= '"","","",""';
    5462                $invoice->status = Invoice::$INVOICE_STATUS_DENIED_EXPORTED;
    … …  
    5765                $csv_line .=
    5866                    '"' . $invoice->type . '",' .
    59                     '"' . $invoice->type . '",' .
    60                     '"' . ( 'APPROVED' === $invoice->status ? trim( $invoice->contact_bank_owner ) : 'NOPAYOUT' ) . '",' .
    61                     '"' . ( 'APPROVED' === $invoice->status ? trim( $invoice->contact_bank_iban ) : 'NOPAYOUT' ) . '",' .
     67                    '"' . $invoice_name . '",' .
     68                    '"' . $invoice_iban . '",' .
    6269                    '"' . mareike_format_amount( $invoice->amount ) . '"';
    6370            }
    … …  
    6875                $invoice->comment = 'NOPAYOUT';
    6976            }
    70 
    71             $invoice->save();
    7277        }
    7378

  • mareike/trunk/mareike.php

    r3233126 r3263898  
    33 * Plugin Name:  mareike
    44 * Description: A tool to help associations to manage travel or material costs for events or ongoing jobs.
    5  * Version: 5.1
     5 * Version: 5.2
    66 * Tags: mareike, administration, fincance, travelmanagement, association tool
    77 * Requires at least: 6.0

  • mareike/trunk/readme.txt

    r3233126 r3263898  
    44Requires at least: 6.0
    55Tested up to: 6.7
    6 Stable tag: 5.1
     6Stable tag: 5.2
    77License: GPLv3
    88License URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    3939
    4040## Changelog ##
     41= 5.2 =
     42* [BUG] Fixed saving name and iban of account owner for new invoices
     43* [BUG] Fixed CSV exports
     44* [BUG] Fixed handling denied invoices
     45
    4146= 5.1 =
    4247* [BUG] Fix in recognition of account data on multisites
Note: See TracChangeset for help on using the changeset viewer.