From 3c9a8fdd35decec1f0cd2c8b9888bf4baee94103 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 15 Dec 2020 20:38:12 +1100 Subject: [PATCH] Fixes for query filters --- .env.example | 2 +- app/Filters/QueryFilters.php | 4 +- app/Import/Definitions/InvoiceMap.php | 160 +++++++++++++++----------- resources/lang/en/texts.php | 2 +- 4 files changed, 97 insertions(+), 71 deletions(-) diff --git a/.env.example b/.env.example index 19c98183f300..ab3a104fb6f4 100644 --- a/.env.example +++ b/.env.example @@ -26,7 +26,7 @@ BROADCAST_DRIVER=log LOG_CHANNEL=stack CACHE_DRIVER=file QUEUE_CONNECTION=database -SESSION_DRIVER=cookie +SESSION_DRIVER=file SESSION_LIFETIME=120 REDIS_HOST=127.0.0.1 diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index d1a16ffa1d21..e9370f56e49f 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -104,11 +104,11 @@ abstract class QueryFilters * @param string $value * @return stdClass */ - public function split($value) : stdClass + public function split($value) : \stdClass { $exploded_array = explode(':', $value); - $parts = new stdClass; + $parts = new \stdClass; $parts->value = $exploded_array[0]; $parts->operator = $this->operatorConvertor($exploded_array[1]); diff --git a/app/Import/Definitions/InvoiceMap.php b/app/Import/Definitions/InvoiceMap.php index a2e05c0256ca..8a3c34a08539 100644 --- a/app/Import/Definitions/InvoiceMap.php +++ b/app/Import/Definitions/InvoiceMap.php @@ -22,41 +22,54 @@ class InvoiceMap 2 => 'invoice.amount', 3 => 'invoice.balance', 4 => 'invoice.client_id', - 5 => 'invoice.status_id', - 6 => 'invoice.is_deleted', - 7 => 'invoice.discount', - 8 => 'invoice.po_number', - 9 => 'invoice.date', - 10 => 'invoice.due_date', - 11 => 'invoice.terms', - 12 => 'invoice.public_notes', - 13 => 'invoice.private_notes', - 14 => 'invoice.uses_inclusive_taxes', - 15 => 'invoice.tax_name1', - 16 => 'invoice.tax_rate1', - 17 => 'invoice.tax_name2', - 18 => 'invoice.tax_rate2', - 19 => 'invoice.tax_name3', - 20 => 'invoice.tax_rate3', - 21 => 'invoice.is_amount_discount', - 22 => 'invoice.footer', - 23 => 'invoice.partial', - 24 => 'invoice.partial_due_date', - 25 => 'invoice.custom_value1', - 26 => 'invoice.custom_value2', - 27 => 'invoice.custom_value3', - 28 => 'invoice.custom_value4', - 29 => 'invoice.custom_surcharge1', - 30 => 'invoice.custom_surcharge2', - 31 => 'invoice.custom_surcharge3', - 32 => 'invoice.custom_surcharge4', - 33 => 'invoice.exchange_rate', - 34 => 'invoice.line_items', - 35 => 'client.name', - 36 => 'client.email', - 37 => 'payment.date', - 38 => 'payment.amount', - 39 => 'payment.transaction_reference', + 5 => 'invoice.discount', + 6 => 'invoice.po_number', + 7 => 'invoice.date', + 8 => 'invoice.due_date', + 9 => 'invoice.terms', + 10 => 'invoice.public_notes', + 11 => 'invoice.is_sent', + 12 => 'invoice.private_notes', + 13 => 'invoice.uses_inclusive_taxes', + 14 => 'invoice.tax_name1', + 15 => 'invoice.tax_rate1', + 16 => 'invoice.tax_name2', + 17 => 'invoice.tax_rate2', + 18 => 'invoice.tax_name3', + 19 => 'invoice.tax_rate3', + 20 => 'invoice.is_amount_discount', + 21 => 'invoice.footer', + 22 => 'invoice.partial', + 23 => 'invoice.partial_due_date', + 24 => 'invoice.custom_value1', + 25 => 'invoice.custom_value2', + 26 => 'invoice.custom_value3', + 27 => 'invoice.custom_value4', + 28 => 'invoice.custom_surcharge1', + 29 => 'invoice.custom_surcharge2', + 30 => 'invoice.custom_surcharge3', + 31 => 'invoice.custom_surcharge4', + 32 => 'invoice.exchange_rate', + 33 => 'payment.date', + 34 => 'payment.amount', + 35 => 'payment.transaction_reference', + 36 => 'item.quantity', + 37 => 'item.cost', + 38 => 'item.product_key', + 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', 3 => 'texts.balance', 4 => 'texts.client', - 5 => 'texts.status', - 6 => 'texts.deleted', - 7 => 'texts.discount', - 8 => 'texts.po_number', - 9 => 'texts.date', - 10 => 'texts.due_date', - 11 => 'texts.terms', - 12 => 'texts.public_notes', - 13 => 'texts.private_notes', - 14 => 'texts.uses_inclusive_taxes', - 15 => 'texts.tax_name', - 16 => 'texts.tax_rate', - 17 => 'texts.tax_name', - 18 => 'texts.tax_rate', - 19 => 'texts.tax_name', - 20 => 'texts.tax_rate', - 21 => 'texts.is_amount_discount', - 22 => 'texts.footer', - 23 => 'texts.partial', - 24 => 'texts.partial_due_date', - 25 => 'texts.custom_value1', - 26 => 'texts.custom_value2', - 27 => 'texts.custom_value3', - 28 => 'texts.custom_value4', + 5 => 'texts.discount', + 6 => 'texts.po_number', + 7 => 'texts.date', + 8 => 'texts.due_date', + 9 => 'texts.terms', + 10 => 'texts.public_notes', + 11 => 'texts.sent', + 12 => 'texts.private_notes', + 13 => 'texts.uses_inclusive_taxes', + 14 => 'texts.tax_name', + 15 => 'texts.tax_rate', + 16 => 'texts.tax_name', + 17 => 'texts.tax_rate', + 18 => 'texts.tax_name', + 19 => 'texts.tax_rate', + 20 => 'texts.is_amount_discount', + 21 => 'texts.footer', + 22 => 'texts.partial', + 23 => 'texts.partial_due_date', + 24 => 'texts.custom_value1', + 25 => 'texts.custom_value2', + 26 => 'texts.custom_value3', + 27 => 'texts.custom_value4', + 28 => 'texts.surcharge', 29 => 'texts.surcharge', 30 => 'texts.surcharge', 31 => 'texts.surcharge', - 32 => 'texts.surcharge', - 33 => 'texts.exchange_rate', - 34 => 'texts.items', - 35 => 'texts.client_name', - 36 => 'texts.email', - 37 => 'texts.payment_date', - 38 => 'texts.payment_amount', - 39 => 'texts.transaction_reference', + 32 => 'texts.exchange_rate', + 33 => 'texts.payment_date', + 34 => 'texts.payment_amount', + 35 => 'texts.transaction_reference', + 36 => 'texts.quantity', + 37 => 'texts.cost', + 38 => 'texts.product_key', + 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', ]; } } \ No newline at end of file diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 565053ca7601..56845222f440 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -3325,5 +3325,5 @@ return [ 'custom_value3' => 'Custom Value', 'custom_value4' => 'Custom Value', 'inclusive_taxes' => 'Include taxes', - + 'sort_order' => 'Sort Order', ];