Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for query filters

Browse Source
This commit is contained in:
David Bomba 2020-12-15 20:38:12 +11:00
parent 5025949eaa
commit 3c9a8fdd35
4 changed files with 97 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -26,7 +26,7 @@ BROADCAST_DRIVER=log
LOG_CHANNEL=stack LOG_CHANNEL=stack
CACHE_DRIVER=file CACHE_DRIVER=file
QUEUE_CONNECTION=database QUEUE_CONNECTION=database
SESSION_DRIVER=cookie SESSION_DRIVER=file
SESSION_LIFETIME=120 SESSION_LIFETIME=120
REDIS_HOST=127.0.0.1 REDIS_HOST=127.0.0.1

4
app/Filters/QueryFilters.php
View File

@ -104,11 +104,11 @@ abstract class QueryFilters
* @param string $value * @param string $value
* @return stdClass * @return stdClass
*/ */
public function split($value) : stdClass public function split($value) : \stdClass
{ {
$exploded_array = explode(':', $value); $exploded_array = explode(':', $value);
$parts = new stdClass; $parts = new \stdClass;
$parts->value = $exploded_array[0]; $parts->value = $exploded_array[0];
$parts->operator = $this->operatorConvertor($exploded_array[1]); $parts->operator = $this->operatorConvertor($exploded_array[1]);

160
app/Import/Definitions/InvoiceMap.php
View File

@ -22,41 +22,54 @@ class InvoiceMap
2 => 'invoice.amount', 2 => 'invoice.amount',
3 => 'invoice.balance', 3 => 'invoice.balance',
4 => 'invoice.client_id', 4 => 'invoice.client_id',
5 => 'invoice.status_id', 5 => 'invoice.discount',
6 => 'invoice.is_deleted', 6 => 'invoice.po_number',
7 => 'invoice.discount', 7 => 'invoice.date',
8 => 'invoice.po_number', 8 => 'invoice.due_date',
9 => 'invoice.date', 9 => 'invoice.terms',
10 => 'invoice.due_date', 10 => 'invoice.public_notes',
11 => 'invoice.terms', 11 => 'invoice.is_sent',
12 => 'invoice.public_notes', 12 => 'invoice.private_notes',
13 => 'invoice.private_notes', 13 => 'invoice.uses_inclusive_taxes',
14 => 'invoice.uses_inclusive_taxes', 14 => 'invoice.tax_name1',
15 => 'invoice.tax_name1', 15 => 'invoice.tax_rate1',
16 => 'invoice.tax_rate1', 16 => 'invoice.tax_name2',
17 => 'invoice.tax_name2', 17 => 'invoice.tax_rate2',
18 => 'invoice.tax_rate2', 18 => 'invoice.tax_name3',
19 => 'invoice.tax_name3', 19 => 'invoice.tax_rate3',
20 => 'invoice.tax_rate3', 20 => 'invoice.is_amount_discount',
21 => 'invoice.is_amount_discount', 21 => 'invoice.footer',
22 => 'invoice.footer', 22 => 'invoice.partial',
23 => 'invoice.partial', 23 => 'invoice.partial_due_date',
24 => 'invoice.partial_due_date', 24 => 'invoice.custom_value1',
25 => 'invoice.custom_value1', 25 => 'invoice.custom_value2',
26 => 'invoice.custom_value2', 26 => 'invoice.custom_value3',
27 => 'invoice.custom_value3', 27 => 'invoice.custom_value4',
28 => 'invoice.custom_value4', 28 => 'invoice.custom_surcharge1',
29 => 'invoice.custom_surcharge1', 29 => 'invoice.custom_surcharge2',
30 => 'invoice.custom_surcharge2', 30 => 'invoice.custom_surcharge3',
31 => 'invoice.custom_surcharge3', 31 => 'invoice.custom_surcharge4',
32 => 'invoice.custom_surcharge4', 32 => 'invoice.exchange_rate',
33 => 'invoice.exchange_rate', 33 => 'payment.date',
34 => 'invoice.line_items', 34 => 'payment.amount',
35 => 'client.name', 35 => 'payment.transaction_reference',
36 => 'client.email', 36 => 'item.quantity',
37 => 'payment.date', 37 => 'item.cost',
38 => 'payment.amount', 38 => 'item.product_key',
39 => 'payment.transaction_reference', 39 => 'item.notes',
40 => 'item.discount',
41 => 'item.is_amount_discount',
42 => 'item.tax_name1',
43 => 'item.tax_rate1',
44 => 'item.tax_name2',
45 => 'item.tax_rate2',
46 => 'item.tax_name3',
47 => 'item.tax_rate3',
48 => 'item.custom_value1',
49 => 'item.custom_value2',
50 => 'item.custom_value3',
51 => 'item.custom_value4',
52 => 'item.type_id',
]; ];
} }
@ -68,41 +81,54 @@ class InvoiceMap
2 => 'texts.amount', 2 => 'texts.amount',
3 => 'texts.balance', 3 => 'texts.balance',
4 => 'texts.client', 4 => 'texts.client',
5 => 'texts.status', 5 => 'texts.discount',
6 => 'texts.deleted', 6 => 'texts.po_number',
7 => 'texts.discount', 7 => 'texts.date',
8 => 'texts.po_number', 8 => 'texts.due_date',
9 => 'texts.date', 9 => 'texts.terms',
10 => 'texts.due_date', 10 => 'texts.public_notes',
11 => 'texts.terms', 11 => 'texts.sent',
12 => 'texts.public_notes', 12 => 'texts.private_notes',
13 => 'texts.private_notes', 13 => 'texts.uses_inclusive_taxes',
14 => 'texts.uses_inclusive_taxes', 14 => 'texts.tax_name',
15 => 'texts.tax_name', 15 => 'texts.tax_rate',
16 => 'texts.tax_rate', 16 => 'texts.tax_name',
17 => 'texts.tax_name', 17 => 'texts.tax_rate',
18 => 'texts.tax_rate', 18 => 'texts.tax_name',
19 => 'texts.tax_name', 19 => 'texts.tax_rate',
20 => 'texts.tax_rate', 20 => 'texts.is_amount_discount',
21 => 'texts.is_amount_discount', 21 => 'texts.footer',
22 => 'texts.footer', 22 => 'texts.partial',
23 => 'texts.partial', 23 => 'texts.partial_due_date',
24 => 'texts.partial_due_date', 24 => 'texts.custom_value1',
25 => 'texts.custom_value1', 25 => 'texts.custom_value2',
26 => 'texts.custom_value2', 26 => 'texts.custom_value3',
27 => 'texts.custom_value3', 27 => 'texts.custom_value4',
28 => 'texts.custom_value4', 28 => 'texts.surcharge',
29 => 'texts.surcharge', 29 => 'texts.surcharge',
30 => 'texts.surcharge', 30 => 'texts.surcharge',
31 => 'texts.surcharge', 31 => 'texts.surcharge',
32 => 'texts.surcharge', 32 => 'texts.exchange_rate',
33 => 'texts.exchange_rate', 33 => 'texts.payment_date',
34 => 'texts.items', 34 => 'texts.payment_amount',
35 => 'texts.client_name', 35 => 'texts.transaction_reference',
36 => 'texts.email', 36 => 'texts.quantity',
37 => 'texts.payment_date', 37 => 'texts.cost',
38 => 'texts.payment_amount', 38 => 'texts.product_key',
39 => 'texts.transaction_reference', 39 => 'texts.notes',
40 => 'texts.discount',
41 => 'texts.is_amount_discount',
42 => 'texts.tax_name',
43 => 'texts.tax_rate',
44 => 'texts.tax_name',
45 => 'texts.tax_rate',
46 => 'texts.tax_name',
47 => 'texts.tax_rate',
48 => 'texts.custom_value',
49 => 'texts.custom_value',
50 => 'texts.custom_value',
51 => 'texts.custom_value',
52 => 'texts.type',
]; ];
} }
} }

2
resources/lang/en/texts.php
View File

@ -3325,5 +3325,5 @@ return [
'custom_value3' => 'Custom Value', 'custom_value3' => 'Custom Value',
'custom_value4' => 'Custom Value', 'custom_value4' => 'Custom Value',
'inclusive_taxes' => 'Include taxes', 'inclusive_taxes' => 'Include taxes',
'sort_order' => 'Sort Order',
]; ];