Plugin Directory

Changeset 3211568


Ignore:
Timestamp:
12/21/2024 02:07:42 PM (16 months ago)
Author:
tidschi
Message:

Update to version 3.1 from GitHub

Location:
mareike
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • mareike/tags/3.1/app/requests/class-getuserinvoices.php

    r3211566 r3211568  
    4444            Invoice::where(
    4545                ['user_id' => $user_id, 'status' => Invoice::$INVOICE_STATUS_DENIED]
    46             )->orWhere(
    47                 [['user_id' => $user_id, 'status' => Invoice::$INVOICE_STATUS_DENIED_EXPORTED]]
     46            )->get() as $invoice) {
     47            $costunit = CostUnit::where('id', $invoice->costunit_id)->first();
     48            $invoice->cost_unit_name = $costunit->cost_unit_name;
     49            $data->push($invoice);
     50        }
     51
     52        foreach (
     53            Invoice::where(
     54                ['user_id' => $user_id, 'status' => Invoice::$INVOICE_STATUS_DENIED_EXPORTED]
    4855            )->get() as $invoice) {
    4956            $costunit = CostUnit::where('id', $invoice->costunit_id)->first();
  • mareike/tags/3.1/mareike.php

    r3211566 r3211568  
    33 * Plugin Name:  mareike
    44 * Description: A tool to help associations to manage travel or material costs for events or ongoing jobs.
    5  * Version: 3.0
     5 * Version: 3.1
    66 * Tags: mareike, administration, fincance, travelmanagement, association tool
    77 * Requires at least: 6.0
  • mareike/tags/3.1/readme.txt

    r3211566 r3211568  
    44Requires at least: 6.0
    55Tested up to: 6.7
    6 Stable tag: 3.0
     6Stable tag: 3.1
    77License: GPLv3
    88License URI: http://www.gnu.org/licenses/gpl-3.0.html
     
    3939
    4040## Changelog ##
     41= 3.1 =
     42* [BUG] Fix for displaying number of denied invoices in widget
     43
    4144= 3.0 =
    4245* [FEA] Component to sync invoices to NextCloud / WebDav
  • mareike/trunk/app/requests/class-getuserinvoices.php

    r3211566 r3211568  
    4444            Invoice::where(
    4545                ['user_id' => $user_id, 'status' => Invoice::$INVOICE_STATUS_DENIED]
    46             )->orWhere(
    47                 [['user_id' => $user_id, 'status' => Invoice::$INVOICE_STATUS_DENIED_EXPORTED]]
     46            )->get() as $invoice) {
     47            $costunit = CostUnit::where('id', $invoice->costunit_id)->first();
     48            $invoice->cost_unit_name = $costunit->cost_unit_name;
     49            $data->push($invoice);
     50        }
     51
     52        foreach (
     53            Invoice::where(
     54                ['user_id' => $user_id, 'status' => Invoice::$INVOICE_STATUS_DENIED_EXPORTED]
    4855            )->get() as $invoice) {
    4956            $costunit = CostUnit::where('id', $invoice->costunit_id)->first();
  • mareike/trunk/mareike.php

    r3211566 r3211568  
    33 * Plugin Name:  mareike
    44 * Description: A tool to help associations to manage travel or material costs for events or ongoing jobs.
    5  * Version: 3.0
     5 * Version: 3.1
    66 * Tags: mareike, administration, fincance, travelmanagement, association tool
    77 * Requires at least: 6.0
  • mareike/trunk/readme.txt

    r3211566 r3211568  
    44Requires at least: 6.0
    55Tested up to: 6.7
    6 Stable tag: 3.0
     6Stable tag: 3.1
    77License: GPLv3
    88License URI: http://www.gnu.org/licenses/gpl-3.0.html
     
    3939
    4040## Changelog ##
     41= 3.1 =
     42* [BUG] Fix for displaying number of denied invoices in widget
     43
    4144= 3.0 =
    4245* [FEA] Component to sync invoices to NextCloud / WebDav
Note: See TracChangeset for help on using the changeset viewer.