From e832d42a8b933b1e69a1fc3331278fd4ebe5c25d Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 15:35:11 +0200 Subject: [PATCH 01/16] Added partial with batch delete JS logic --- .../html/partial_batch_delete.phtml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/bb-themes/admin_default/html/partial_batch_delete.phtml diff --git a/src/bb-themes/admin_default/html/partial_batch_delete.phtml b/src/bb-themes/admin_default/html/partial_batch_delete.phtml new file mode 100644 index 000000000..3fe1d8848 --- /dev/null +++ b/src/bb-themes/admin_default/html/partial_batch_delete.phtml @@ -0,0 +1,29 @@ + {% trans 'Delete selected' %} + \ No newline at end of file From 1fdc57377c36418ddca32588238fbac969ada728 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 15:36:32 +0200 Subject: [PATCH 02/16] Batch delete implemented for Client list --- src/bb-modules/Client/Api/Admin.php | 20 +++++++++++++++++++ .../admin_default/html/mod_client_index.phtml | 7 +++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/bb-modules/Client/Api/Admin.php b/src/bb-modules/Client/Api/Admin.php index 70e9c3489..b1130b5a8 100644 --- a/src/bb-modules/Client/Api/Admin.php +++ b/src/bb-modules/Client/Api/Admin.php @@ -722,4 +722,24 @@ class Admin extends \Api_Abstract return $this->di['db']->toArray($model); } + /** + * Deletes clients with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_client_index.phtml b/src/bb-themes/admin_default/html/mod_client_index.phtml index 2e2984a3b..1b1abc9ab 100644 --- a/src/bb-themes/admin_default/html/mod_client_index.phtml +++ b/src/bb-themes/admin_default/html/mod_client_index.phtml @@ -113,6 +113,7 @@ + @@ -126,6 +127,7 @@ {% set clients = admin.client_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for client in clients.list %} + @@ -153,7 +155,8 @@
- + {% include "partial_batch_delete.phtml" with {'action' : 'admin/client/batch_delete'} %} +
@@ -268,7 +271,7 @@
- + From 6b73f12f57e1fadf3e06841d13556d4431769288 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 15:49:47 +0200 Subject: [PATCH 03/16] Batch delete implemented for Orders list --- src/bb-modules/Order/Api/Admin.php | 25 +++++++++++++++++++ .../admin_default/html/mod_order_index.phtml | 3 +++ 2 files changed, 28 insertions(+) diff --git a/src/bb-modules/Order/Api/Admin.php b/src/bb-modules/Order/Api/Admin.php index ea98122a0..ad2e7c2ec 100644 --- a/src/bb-modules/Order/Api/Admin.php +++ b/src/bb-modules/Order/Api/Admin.php @@ -454,4 +454,29 @@ class Admin extends \Api_Abstract return $this->di['db']->getExistingModelById('ClientOrder', $data['id'], 'Order not found'); } + + /** + * Deletes orders with given IDs + * + * @param array $ids - Order ids for deletion + * + * @optional bool $delete_addons - Remove addons also. Default false. + * + * @return bool + */ + public function batch_delete($data) + { + $required = array( + 'ids' => 'Orders ids not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + $delete_addons = isset($data['delete_addons']) ? (bool)$data['delete_addons'] : false; + + foreach ($data['ids'] as $id) { + $this->delete(array('id' => $id, 'delete_addons' => $delete_addons)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_order_index.phtml b/src/bb-themes/admin_default/html/mod_order_index.phtml index ac0162bdf..3bebfe7b6 100644 --- a/src/bb-themes/admin_default/html/mod_order_index.phtml +++ b/src/bb-themes/admin_default/html/mod_order_index.phtml @@ -119,6 +119,7 @@
{% trans 'Name' %} {% trans 'Company' %} {% trans 'Email' %}
{{ client.id }}
+ @@ -133,6 +134,7 @@ {% set orders = admin.order_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, order in orders.list %} + @@ -153,6 +155,7 @@
{% trans 'ID' %} {% trans 'Client' %} {% trans 'Title' %}
{{order.id}} {{ order.client.email }} {{order.client.first_name}} {{order.client.last_name}}
{% include "partial_pagination.phtml" with {'list': orders, 'url':'order'} %} + {% include "partial_batch_delete.phtml" with {'action' : 'admin/order/batch_delete'} %} From af51224e61b3729fc5ee507ec31ad26108ddecb1 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 15:55:22 +0200 Subject: [PATCH 04/16] Batch delete implemented for Invoices list --- src/bb-modules/Invoice/Api/Admin.php | 21 +++++++++++++++++++ .../html/mod_invoice_index.phtml | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/bb-modules/Invoice/Api/Admin.php b/src/bb-modules/Invoice/Api/Admin.php index 9f35abf18..12cc8fc0c 100644 --- a/src/bb-modules/Invoice/Api/Admin.php +++ b/src/bb-modules/Invoice/Api/Admin.php @@ -884,4 +884,25 @@ class Admin extends \Api_Abstract return $model; } + + /** + * Deletes invoices with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_invoice_index.phtml b/src/bb-themes/admin_default/html/mod_invoice_index.phtml index d090ac589..69af7f9b0 100644 --- a/src/bb-themes/admin_default/html/mod_invoice_index.phtml +++ b/src/bb-themes/admin_default/html/mod_invoice_index.phtml @@ -109,6 +109,7 @@ + @@ -121,6 +122,7 @@ {% set invoices = admin.invoice_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for invoice in invoices.list %} + @@ -142,6 +144,7 @@
{% trans 'Invoice' %} {% trans 'Amount' %} {% trans 'Issued at' %}
{{ invoice.buyer.email }} {{invoice.client.first_name|truncate(1, null, '.')}} {{invoice.client.last_name|truncate(20)}} {{ invoice.serie_nr }}
{% include "partial_pagination.phtml" with {'list': invoices, 'url':'invoice'} %} + {% include "partial_batch_delete.phtml" with {'action' : 'admin/invoice/batch_delete'} %}
From dfdd5420719bba8a314ddba936c9ad602c94d6d8 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 15:58:59 +0200 Subject: [PATCH 05/16] Batch delete implemented for Subscriptions list --- src/bb-modules/Invoice/Api/Admin.php | 21 +++++++++++++++++++ .../html/mod_invoice_subscriptions.phtml | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/bb-modules/Invoice/Api/Admin.php b/src/bb-modules/Invoice/Api/Admin.php index 12cc8fc0c..f8d81b169 100644 --- a/src/bb-modules/Invoice/Api/Admin.php +++ b/src/bb-modules/Invoice/Api/Admin.php @@ -905,4 +905,25 @@ class Admin extends \Api_Abstract return true; } + + /** + * Deletes subscriptions with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete_subscription($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->subscription_delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_invoice_subscriptions.phtml b/src/bb-themes/admin_default/html/mod_invoice_subscriptions.phtml index 4b0f54544..836f40eb2 100644 --- a/src/bb-themes/admin_default/html/mod_invoice_subscriptions.phtml +++ b/src/bb-themes/admin_default/html/mod_invoice_subscriptions.phtml @@ -21,6 +21,7 @@ + @@ -33,6 +34,7 @@ {% set subscriptions = admin.invoice_subscription_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, subscription in subscriptions.list %} + @@ -52,7 +54,8 @@ {% endfor %}
{% trans 'ID' %} {% trans 'Status' %} {% trans 'Gateway' %}
{{ subscription.client.email }} {{ subscription.sid }} {{ mf.status_name(subscription.status) }}
- + {% include "partial_batch_delete.phtml" with {'action' : 'admin/invoice/batch_delete_subscription'} %} + {% include "partial_pagination.phtml" with {'list': subscriptions, 'url':'invoice/subscriptions'} %}
From 936c5e211b3c1eb30fa39e3bb3b9e45befb33a45 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:01:14 +0200 Subject: [PATCH 06/16] Batch delete implemented for Transactions list --- src/bb-modules/Invoice/Api/Admin.php | 21 +++++++++++++++++++ .../html/mod_invoice_transactions.phtml | 5 +++++ 2 files changed, 26 insertions(+) diff --git a/src/bb-modules/Invoice/Api/Admin.php b/src/bb-modules/Invoice/Api/Admin.php index f8d81b169..94eb3ff1c 100644 --- a/src/bb-modules/Invoice/Api/Admin.php +++ b/src/bb-modules/Invoice/Api/Admin.php @@ -926,4 +926,25 @@ class Admin extends \Api_Abstract return true; } + + /** + * Deletes transactions with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete_transaction($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->transaction_delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_invoice_transactions.phtml b/src/bb-themes/admin_default/html/mod_invoice_transactions.phtml index b0c8f5ed4..09ab88957 100644 --- a/src/bb-themes/admin_default/html/mod_invoice_transactions.phtml +++ b/src/bb-themes/admin_default/html/mod_invoice_transactions.phtml @@ -104,6 +104,7 @@ + @@ -118,6 +119,7 @@ {% set transactions = admin.invoice_transaction_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, tx in transactions.list %} + @@ -139,6 +141,9 @@ {% endfor %}
{% trans 'Invoice' %} {% trans 'Type' %} {% trans 'Status' %}
{% if tx.invoice_id %}#{{ tx.invoice_id }}{%else%}n/a{% endif %} {{mf.status_name(tx.type|default('-')) }} {% if tx.error %}{{ tx.error_code }}{% else %}{{mf.status_name(tx.status) }}{% endif %}
+ + {% include "partial_batch_delete.phtml" with {'action':'admin/invoice/batch_delete_transaction'} %} + {% include "partial_pagination.phtml" with {'list': transactions, 'url':'invoice/transactions'} %} {% endblock %} \ No newline at end of file From 891fd99fed9502e83f88e5a979e1889565e57cc7 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:07:18 +0200 Subject: [PATCH 07/16] Batch delete implemented for Tickets list --- src/bb-modules/Support/Api/Admin.php | 21 +++++++++++++++++++ .../html/mod_support_tickets.phtml | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/src/bb-modules/Support/Api/Admin.php b/src/bb-modules/Support/Api/Admin.php index d57668478..c5b26e433 100644 --- a/src/bb-modules/Support/Api/Admin.php +++ b/src/bb-modules/Support/Api/Admin.php @@ -793,4 +793,25 @@ class Admin extends \Api_Abstract return $this->getService()->ticketTaskComplete($model); } + + /** + * Deletes tickets with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->ticket_delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_support_tickets.phtml b/src/bb-themes/admin_default/html/mod_support_tickets.phtml index 3d2f467d9..96badd690 100644 --- a/src/bb-themes/admin_default/html/mod_support_tickets.phtml +++ b/src/bb-themes/admin_default/html/mod_support_tickets.phtml @@ -120,6 +120,7 @@ + @@ -132,6 +133,7 @@ {% set tickets = admin.support_ticket_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, ticket in tickets.list %} +
{% trans 'Client' %} {% trans 'Subject' %} {% trans 'Status' %}
gravatar {{ ticket.client.first_name|truncate(1, null, '.') }} {{ ticket.client.last_name }} @@ -161,6 +163,8 @@
{% include "partial_pagination.phtml" with {'list': tickets, 'url':'support'} %} + {% include "partial_batch_delete.phtml" with {'action':'admin/support/batch_delete'} %} +
From b1fc9482fcb8f08d5a81b066da1182e8c0d0aaa8 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:10:28 +0200 Subject: [PATCH 08/16] Batch delete implemented for Public Tickets list --- src/bb-modules/Support/Api/Admin.php | 21 +++++++++++++++++++ .../html/mod_support_public_tickets.phtml | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/src/bb-modules/Support/Api/Admin.php b/src/bb-modules/Support/Api/Admin.php index c5b26e433..2dd30247a 100644 --- a/src/bb-modules/Support/Api/Admin.php +++ b/src/bb-modules/Support/Api/Admin.php @@ -814,4 +814,25 @@ class Admin extends \Api_Abstract return true; } + + /** + * Deletes tickets with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete_public($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->public_ticket_delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_support_public_tickets.phtml b/src/bb-themes/admin_default/html/mod_support_public_tickets.phtml index 2417d6a4b..7df29e264 100644 --- a/src/bb-themes/admin_default/html/mod_support_public_tickets.phtml +++ b/src/bb-themes/admin_default/html/mod_support_public_tickets.phtml @@ -21,6 +21,7 @@ + @@ -33,6 +34,7 @@ {% set tickets = admin.support_public_ticket_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, ticket in tickets.list %} + @@ -52,4 +54,6 @@
{% trans 'Subject' %} {% trans 'Email' %} {% trans 'Status' %}
#{{ ticket.id }} - {{ ticket.subject }} ({{ ticket.messages|length}}) {{ ticket.author_email }} {{ mf.status_name(ticket.status) }}
{% include "partial_pagination.phtml" with {'list': tickets, 'url':'support/public-tickets'} %} +{% include "partial_batch_delete.phtml" with {'action':'admin/support/batch_delete_public'} %} + {% endblock %} From d02dbacd9998792b54d9e411f3c39863c88b06d1 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:13:01 +0200 Subject: [PATCH 09/16] Batch delete implemented for News list --- src/bb-modules/News/Api/Admin.php | 21 +++++++++++++++++++ .../News/html_admin/mod_news_index.phtml | 5 +++++ 2 files changed, 26 insertions(+) diff --git a/src/bb-modules/News/Api/Admin.php b/src/bb-modules/News/Api/Admin.php index 4b029af7e..9ebf72dae 100644 --- a/src/bb-modules/News/Api/Admin.php +++ b/src/bb-modules/News/Api/Admin.php @@ -176,4 +176,25 @@ class Admin extends \Api_Abstract $this->di['logger']->info('Removed news item #%s', $id); return true; } + + /** + * Deletes news items with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-modules/News/html_admin/mod_news_index.phtml b/src/bb-modules/News/html_admin/mod_news_index.phtml index 8f5468e28..b5191d544 100644 --- a/src/bb-modules/News/html_admin/mod_news_index.phtml +++ b/src/bb-modules/News/html_admin/mod_news_index.phtml @@ -20,6 +20,8 @@ + + @@ -31,6 +33,7 @@ {% set posts = admin.news_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, post in posts.list %} + @@ -51,6 +54,8 @@
# {% trans 'Title' %} {% trans 'Active' %} {% trans 'Date' %}
{{ post.id }} {{ post.title }} {{ mf.status_name(post.status) }}
{% include "partial_pagination.phtml" with {'list': posts, 'url':'news/index'} %} + {% include "partial_batch_delete.phtml" with {'action' : 'admin/news/batch_delete'} %} +
From 2f484e5a415487ca351dbbd0999a946390dcaf93 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:17:30 +0200 Subject: [PATCH 10/16] Batch delete implemented for Taxes list --- src/bb-modules/Invoice/Api/Admin.php | 21 +++++++++++++++++++ .../admin_default/html/mod_invoice_tax.phtml | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/src/bb-modules/Invoice/Api/Admin.php b/src/bb-modules/Invoice/Api/Admin.php index 94eb3ff1c..21f7e295d 100644 --- a/src/bb-modules/Invoice/Api/Admin.php +++ b/src/bb-modules/Invoice/Api/Admin.php @@ -947,4 +947,25 @@ class Admin extends \Api_Abstract return true; } + + /** + * Deletes taxes with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete_tax($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->tax_delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_invoice_tax.phtml b/src/bb-themes/admin_default/html/mod_invoice_tax.phtml index ab48fc880..69c0cb83a 100644 --- a/src/bb-themes/admin_default/html/mod_invoice_tax.phtml +++ b/src/bb-themes/admin_default/html/mod_invoice_tax.phtml @@ -18,6 +18,7 @@ + @@ -29,6 +30,7 @@ {% for tax in admin.invoice_tax_get_list({"per_page":100}).list %} + {% endfor %}
{% trans 'Name' %} {% trans 'Country' %} {% trans 'State/Region' %}
{{ tax.name }} {% if tax.country %} @@ -62,6 +64,8 @@
+ {% include "partial_batch_delete.phtml" with {'action' : 'admin/invoice/batch_delete_tax'} %} +
From 9fbdd5e8d9258c6fed54f318c598d230c1f026a1 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:21:46 +0200 Subject: [PATCH 11/16] Batch delete implemented for Activity logs list --- src/bb-modules/Activity/Api/Admin.php | 21 +++++++++++++++++++ .../html/mod_activity_index.phtml | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/bb-modules/Activity/Api/Admin.php b/src/bb-modules/Activity/Api/Admin.php index b4eaa3932..17a92e24b 100644 --- a/src/bb-modules/Activity/Api/Admin.php +++ b/src/bb-modules/Activity/Api/Admin.php @@ -117,4 +117,25 @@ class Admin extends \Api_Abstract $database->trash($model); return true; } + + /** + * Deletes logs with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->log_delete(array('id' => $id)); + } + + return true; + } } diff --git a/src/bb-themes/admin_default/html/mod_activity_index.phtml b/src/bb-themes/admin_default/html/mod_activity_index.phtml index 141f30f9a..f20ac2cde 100644 --- a/src/bb-themes/admin_default/html/mod_activity_index.phtml +++ b/src/bb-themes/admin_default/html/mod_activity_index.phtml @@ -11,6 +11,7 @@ + @@ -23,6 +24,7 @@ {% set events = admin.activity_log_get_list({"per_page":10, "page":request.page}|merge(request)) %} {% for i, event in events.list %} +
{% trans 'Message' %} {% trans 'Ip' %} {% trans 'Country' %}
{% if event.client %} {{ event.client.name }} {{ event.client.name }} @@ -51,7 +53,7 @@
- +{% include "partial_batch_delete.phtml" with {'action' : 'admin/activity/batch_delete'} %} {% include "partial_pagination.phtml" with {'list': events, 'url':'activity'} %} {% endblock %} From aed452622f0e4bed2b09ddada1b3b9a6f41f408e Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:24:40 +0200 Subject: [PATCH 12/16] Batch delete implemented for Email history logs --- src/bb-modules/Email/Api/Admin.php | 21 +++++++++++++++++++ .../Email/html_admin/mod_email_history.phtml | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/bb-modules/Email/Api/Admin.php b/src/bb-modules/Email/Api/Admin.php index c414598d0..c647844c6 100644 --- a/src/bb-modules/Email/Api/Admin.php +++ b/src/bb-modules/Email/Api/Admin.php @@ -406,4 +406,25 @@ class Admin extends \Api_Abstract return $this->getService()->sendTemplate($data); } + /** + * Deletes email logs with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->email_delete(array('id' => $id)); + } + + return true; + } + } \ No newline at end of file diff --git a/src/bb-modules/Email/html_admin/mod_email_history.phtml b/src/bb-modules/Email/html_admin/mod_email_history.phtml index 1383e100e..b0dc8a35e 100644 --- a/src/bb-modules/Email/html_admin/mod_email_history.phtml +++ b/src/bb-modules/Email/html_admin/mod_email_history.phtml @@ -11,6 +11,7 @@ + @@ -23,6 +24,7 @@ {% set emails = admin.email_email_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, email in emails.list %} + @@ -45,6 +47,7 @@ +{% include "partial_batch_delete.phtml" with {'action' : 'admin/email/batch_delete'} %} {% include "partial_pagination.phtml" with {'list': emails, 'url':'email/history'} %} {% endblock %} From 9054289e5bda55bbd12c4d96d164a65c9dc8acab Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:50:51 +0200 Subject: [PATCH 13/16] Batch delete implemented for Admin login logs --- src/bb-modules/Staff/Api/Admin.php | 21 +++++++++++++++++++ .../html/mod_staff_login_history.phtml | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/src/bb-modules/Staff/Api/Admin.php b/src/bb-modules/Staff/Api/Admin.php index 32d924e2a..1fc98c51e 100644 --- a/src/bb-modules/Staff/Api/Admin.php +++ b/src/bb-modules/Staff/Api/Admin.php @@ -513,4 +513,25 @@ class Admin extends \Api_Abstract $this->di['logger']->info('Changed profile password'); return true; } + + /** + * Deletes admin login logs with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete_logs($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->login_history_delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_staff_login_history.phtml b/src/bb-themes/admin_default/html/mod_staff_login_history.phtml index 770f51b7c..328dd701c 100644 --- a/src/bb-themes/admin_default/html/mod_staff_login_history.phtml +++ b/src/bb-themes/admin_default/html/mod_staff_login_history.phtml @@ -11,6 +11,7 @@
{% trans 'To' %} {% trans 'From' %} {% trans 'Subject' %}
{{ email.recipients }} {{ email.sender }} {{ email.subject|truncate(40) }}
+ @@ -23,6 +24,7 @@ {% set history = admin.staff_login_history_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, event in history.list %} + @@ -45,4 +47,6 @@ {% include "partial_pagination.phtml" with {'list': history, 'url':'staff/logins'} %} +{% include "partial_batch_delete.phtml" with {'action' : 'admin/staff/batch_delete_logs'} %} + {% endblock %} From b56fb9033395733f9a3b8b63b8026dcb0e65c977 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Fri, 28 Nov 2014 16:56:05 +0200 Subject: [PATCH 14/16] Batch delete implemented for CLient Login logs --- src/bb-modules/Client/Api/Admin.php | 22 +++++++++++++++++++ .../html/mod_client_login_history.phtml | 5 ++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/bb-modules/Client/Api/Admin.php b/src/bb-modules/Client/Api/Admin.php index b1130b5a8..51a5f5d09 100644 --- a/src/bb-modules/Client/Api/Admin.php +++ b/src/bb-modules/Client/Api/Admin.php @@ -742,4 +742,26 @@ class Admin extends \Api_Abstract return true; } + + + /** + * Deletes client login logs with given IDs + * + * @param array $ids - IDs for deletion + * + * @return bool + */ + public function batch_delete_log($data) + { + $required = array( + 'ids' => 'IDs not passed', + ); + $this->di['validator']->checkRequiredParamsForArray($required, $data); + + foreach ($data['ids'] as $id) { + $this->login_history_delete(array('id' => $id)); + } + + return true; + } } \ No newline at end of file diff --git a/src/bb-themes/admin_default/html/mod_client_login_history.phtml b/src/bb-themes/admin_default/html/mod_client_login_history.phtml index 2657b6043..7f7cbdaeb 100644 --- a/src/bb-themes/admin_default/html/mod_client_login_history.phtml +++ b/src/bb-themes/admin_default/html/mod_client_login_history.phtml @@ -11,6 +11,7 @@
{% trans 'Admin' %} {% trans 'IP' %} {% trans 'Country' %}
{{ event.staff.email }} {{ event.staff.name }} {{ event.ip }}
+ @@ -23,6 +24,7 @@ {% set history = admin.client_login_history_get_list({"per_page":30, "page":request.page}|merge(request)) %} {% for i, event in history.list %} + @@ -42,7 +44,8 @@
{% trans 'Client' %} {% trans 'IP' %} {% trans 'Country' %}
{{ event.client.email }} {{ event.client.first_name }} {{ event.client.last_name }} {{ event.ip }}
-{% include "partial_pagination.phtml" with {'list': history, 'url':'client/logins'} %} + {% include "partial_batch_delete.phtml" with {'action' : 'admin/client/batch_delete_log'} %} + {% include "partial_pagination.phtml" with {'list': history, 'url':'client/logins'} %} {% endblock %} From d1a4afcbb1433cf9ec5ce5196226c4894853b965 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Mon, 1 Dec 2014 11:01:44 +0200 Subject: [PATCH 15/16] PHPUnit tests added --- tests/bb-modules/Activity/Api/AdminTest.php | 18 +++++ tests/bb-modules/Client/Api/AdminTest.php | 38 ++++++++++ tests/bb-modules/Email/Api/Api_AdminTest.php | 18 +++++ tests/bb-modules/Invoice/Api/AdminTest.php | 74 +++++++++++++++++++ tests/bb-modules/Order/Api/Api_AdminTest.php | 19 +++++ tests/bb-modules/Staff/Api/AdminTest.php | 18 +++++ .../bb-modules/Support/Api/Api_AdminTest.php | 36 +++++++++ 7 files changed, 221 insertions(+) diff --git a/tests/bb-modules/Activity/Api/AdminTest.php b/tests/bb-modules/Activity/Api/AdminTest.php index 552523c80..cd97ef37b 100644 --- a/tests/bb-modules/Activity/Api/AdminTest.php +++ b/tests/bb-modules/Activity/Api/AdminTest.php @@ -178,5 +178,23 @@ class AdminTest extends \PHPUnit_Framework_TestCase { $result = $activity->log_delete(array('id' => 1)); } + + public function testBatch_delete() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Activity\Api\Admin')->setMethods(array('log_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('log_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } } \ No newline at end of file diff --git a/tests/bb-modules/Client/Api/AdminTest.php b/tests/bb-modules/Client/Api/AdminTest.php index a16c2883e..afda5f32d 100644 --- a/tests/bb-modules/Client/Api/AdminTest.php +++ b/tests/bb-modules/Client/Api/AdminTest.php @@ -1087,4 +1087,42 @@ class AdminTest extends \PHPUnit_Framework_TestCase { $data = array('id' => 1); $admin_Client->login_history_delete($data); } + + public function testBatch_delete() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Client\Api\Admin')->setMethods(array('delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + + public function testBatch_delete_log() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Client\Api\Admin')->setMethods(array('login_history_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('login_history_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete_log(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + + } diff --git a/tests/bb-modules/Email/Api/Api_AdminTest.php b/tests/bb-modules/Email/Api/Api_AdminTest.php index f0862e950..62e1c9326 100644 --- a/tests/bb-modules/Email/Api/Api_AdminTest.php +++ b/tests/bb-modules/Email/Api/Api_AdminTest.php @@ -730,4 +730,22 @@ class AdminTest extends \PHPUnit_Framework_TestCase $this->assertEquals($result, 'rendered'); } + public function testBatch_delete() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Email\Api\Admin')->setMethods(array('email_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('email_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + } diff --git a/tests/bb-modules/Invoice/Api/AdminTest.php b/tests/bb-modules/Invoice/Api/AdminTest.php index 98ab18a55..aaee5f655 100644 --- a/tests/bb-modules/Invoice/Api/AdminTest.php +++ b/tests/bb-modules/Invoice/Api/AdminTest.php @@ -1338,6 +1338,80 @@ class AdminTest extends \PHPUnit_Framework_TestCase { $this->assertTrue($result); } + public function testBatch_delete() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Invoice\Api\Admin')->setMethods(array('delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())-> + method('delete')-> + will($this->returnValue(true)); + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + + public function testBatch_delete_subscription() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Invoice\Api\Admin')->setMethods(array('subscription_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('subscription_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete_subscription(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + + public function testBatch_delete_transaction() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Invoice\Api\Admin')->setMethods(array('transaction_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('transaction_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete_transaction(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + + + public function testBatch_delete_tax() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Invoice\Api\Admin')->setMethods(array('tax_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('tax_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete_tax(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + } \ No newline at end of file diff --git a/tests/bb-modules/Order/Api/Api_AdminTest.php b/tests/bb-modules/Order/Api/Api_AdminTest.php index 7f857e8a3..c696989c2 100644 --- a/tests/bb-modules/Order/Api/Api_AdminTest.php +++ b/tests/bb-modules/Order/Api/Api_AdminTest.php @@ -697,6 +697,25 @@ class AdminTest extends \PHPUnit_Framework_TestCase $result = $this->api->get($data); } + public function testBatch_delete() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Order\Api\Admin')->setMethods(array('delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())-> + method('delete')-> + will($this->returnValue(true)); + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + } \ No newline at end of file diff --git a/tests/bb-modules/Staff/Api/AdminTest.php b/tests/bb-modules/Staff/Api/AdminTest.php index cd435dcd8..e34e72056 100644 --- a/tests/bb-modules/Staff/Api/AdminTest.php +++ b/tests/bb-modules/Staff/Api/AdminTest.php @@ -549,5 +549,23 @@ class AdminTest extends \PHPUnit_Framework_TestCase { $this->assertInternalType('bool', $result); $this->assertTrue($result); } + + public function testBatch_delete() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Staff\Api\Admin')->setMethods(array('login_history_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('login_history_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete_logs(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } } \ No newline at end of file diff --git a/tests/bb-modules/Support/Api/Api_AdminTest.php b/tests/bb-modules/Support/Api/Api_AdminTest.php index 525056673..63585737a 100644 --- a/tests/bb-modules/Support/Api/Api_AdminTest.php +++ b/tests/bb-modules/Support/Api/Api_AdminTest.php @@ -1331,5 +1331,41 @@ class Api_AdminTest extends \PHPUnit_Framework_TestCase $this->assertTrue($result); } + + public function testBatch_delete() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Support\Api\Admin')->setMethods(array('ticket_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('ticket_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } + + public function testBatch_delete_public() + { + $activityMock = $this->getMockBuilder('\Box\Mod\Support\Api\Admin')->setMethods(array('public_ticket_delete'))->getMock(); + $activityMock->expects($this->atLeastOnce())->method('public_ticket_delete')->will($this->returnValue(true)); + + $validatorMock = $this->getMockBuilder('\Box_Validate')->disableOriginalConstructor()->getMock(); + $validatorMock->expects($this->atLeastOnce()) + ->method('checkRequiredParamsForArray') + ->will($this->returnValue(null)); + + $di = new \Box_Di(); + $di['validator'] = $validatorMock; + $activityMock->setDi($di); + + $result = $activityMock->batch_delete_public(array('ids' => array(1, 2, 3))); + $this->assertEquals(true, $result); + } } \ No newline at end of file From 54314edb5e696348961822497908008a964503d7 Mon Sep 17 00:00:00 2001 From: 4Giedrius <4giedrius@gmail.com> Date: Mon, 1 Dec 2014 12:45:48 +0200 Subject: [PATCH 16/16] Integration tests added --- .../bb-modules/mod_activity/Api_AdminTest.php | 14 +++++ .../bb-modules/mod_client/Api_AdminTest.php | 44 ++++++++++++++- .../bb-modules/mod_email/Api_AdminTest.php | 13 +++++ .../bb-modules/mod_invoice/Api_AdminTest.php | 56 +++++++++++++++++++ .../bb-modules/mod_news/Api_AdminTest.php | 14 +++++ .../bb-modules/mod_order/Api_AdminTest.php | 13 +++++ .../bb-modules/mod_staff/Api_AdminTest.php | 12 ++++ .../bb-modules/mod_support/Api_AdminTest.php | 28 ++++++++++ 8 files changed, 193 insertions(+), 1 deletion(-) diff --git a/tests/integration/bb-modules/mod_activity/Api_AdminTest.php b/tests/integration/bb-modules/mod_activity/Api_AdminTest.php index d82cb0aaa..7bd8dd7dc 100644 --- a/tests/integration/bb-modules/mod_activity/Api_AdminTest.php +++ b/tests/integration/bb-modules/mod_activity/Api_AdminTest.php @@ -57,4 +57,18 @@ class Api_Admin_ActivityTest extends BBDbApiTestCase $this->assertArrayHasKey('updated_at', $item); } } + + public function testBatchDelete() + { + $array = $this->api_admin->activity_log_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->activity_batch_delete(array('ids' => $ids)); + $array = $this->api_admin->activity_log_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } } \ No newline at end of file diff --git a/tests/integration/bb-modules/mod_client/Api_AdminTest.php b/tests/integration/bb-modules/mod_client/Api_AdminTest.php index 087ac0890..a5271d41c 100644 --- a/tests/integration/bb-modules/mod_client/Api_AdminTest.php +++ b/tests/integration/bb-modules/mod_client/Api_AdminTest.php @@ -203,7 +203,49 @@ class Api_Admin_ClientTest extends BBDbApiTestCase $this->assertArrayHasKey('amount', $item); $this->assertArrayHasKey('currency', $item); $this->assertArrayHasKey('created_at', $item); - } } + + public function testClientBatchDelete() + { + $id = $this->api_admin->client_create( + array( + 'email' => 'tester@gmail.com', + 'first_name' => 'Client', + 'password' => 'password', + )); + + $id2 = $this->api_admin->client_create( + array( + 'email' => 'tester2@gmail.com', + 'first_name' => 'Client', + 'password' => 'password', + )); + $id3 = $this->api_admin->client_create( + array( + 'email' => 'tester3@gmail.com', + 'first_name' => 'Client', + 'password' => 'password', + )); + + $array = $this->api_admin->client_get_list(array()); + $count = count($array['list']); + $result = $this->api_admin->client_batch_delete(array('ids' => array($id, $id2, $id3))); + $array = $this->api_admin->client_get_list(array()); + + $this->assertEquals($count - 3, count($array['list'])); + $this->assertTrue($result); + } + + public function testClientBatchDeleteLog() + { + $this->api_admin->client_login(array('id' => 1)); + $array = $this->api_admin->client_login_history_get_list(array()); + + $result = $this->api_admin->client_batch_delete_log(array('ids' => array($array['list'][0]))); + $array = $this->api_admin->client_login_history_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } } \ No newline at end of file diff --git a/tests/integration/bb-modules/mod_email/Api_AdminTest.php b/tests/integration/bb-modules/mod_email/Api_AdminTest.php index ba11bb9fc..0b57eaaeb 100644 --- a/tests/integration/bb-modules/mod_email/Api_AdminTest.php +++ b/tests/integration/bb-modules/mod_email/Api_AdminTest.php @@ -220,6 +220,19 @@ class Api_Admin_EmailTest extends BBDbApiTestCase $this->assertArrayHasKey('subject', $item); $this->assertArrayHasKey('description', $item); } + } + public function testBatchDelete() + { + $array = $this->api_admin->email_email_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->email_batch_delete(array('ids' => $ids)); + $array = $this->api_admin->email_email_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); } } \ No newline at end of file diff --git a/tests/integration/bb-modules/mod_invoice/Api_AdminTest.php b/tests/integration/bb-modules/mod_invoice/Api_AdminTest.php index c3ad3b345..a90287b64 100644 --- a/tests/integration/bb-modules/mod_invoice/Api_AdminTest.php +++ b/tests/integration/bb-modules/mod_invoice/Api_AdminTest.php @@ -756,4 +756,60 @@ class Api_Admin_InvoiceTest extends BBDbApiTestCase $this->assertInternalType('array', $gateway['accepted_currencies']); } } + + public function testInvoiceBatchDelete() + { + $array = $this->api_admin->invoice_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->invoice_batch_delete(array('ids' => $ids)); + $array = $this->api_admin->invoice_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } + + public function testInvoiceBatchDeleteSubscription() + { + $array = $this->api_admin->invoice_subscription_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->invoice_batch_delete_subscription(array('ids' => $ids)); + $array = $this->api_admin->invoice_subscription_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } + + public function testInvoiceBatchDeleteTransaction() + { + $array = $this->api_admin->invoice_transaction_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->invoice_batch_delete_transaction(array('ids' => $ids)); + $array = $this->api_admin->invoice_transaction_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } + + public function testInvoiceBatchDeleteTax() + { + $array = $this->api_admin->invoice_tax_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->invoice_batch_delete_tax(array('ids' => $ids)); + $array = $this->api_admin->invoice_tax_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } } \ No newline at end of file diff --git a/tests/integration/bb-modules/mod_news/Api_AdminTest.php b/tests/integration/bb-modules/mod_news/Api_AdminTest.php index e893ddde4..89ccf5c34 100644 --- a/tests/integration/bb-modules/mod_news/Api_AdminTest.php +++ b/tests/integration/bb-modules/mod_news/Api_AdminTest.php @@ -68,4 +68,18 @@ class Api_Admin_NewsTest extends BBDbApiTestCase } } + + public function testNewsBatchDelete() + { + $array = $this->api_admin->news_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->news_batch_delete(array('ids' => $ids)); + $array = $this->api_admin->news_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } } \ No newline at end of file diff --git a/tests/integration/bb-modules/mod_order/Api_AdminTest.php b/tests/integration/bb-modules/mod_order/Api_AdminTest.php index 33eb1bb87..e48ef833b 100644 --- a/tests/integration/bb-modules/mod_order/Api_AdminTest.php +++ b/tests/integration/bb-modules/mod_order/Api_AdminTest.php @@ -254,4 +254,17 @@ class Api_Admin_OrderTest extends BBDbApiTestCase $result = $this->api_admin->order_status_history_delete($data); $this->assertTrue($result); } + + public function testOrderBatchDelete() + { + $array = $this->api_admin->order_get_list(array()); + + foreach ($array['list'] as $value){ + $ids[] = $value['id']; + } + $result = $this->api_admin->order_batch_delete(array('ids' => $ids, 'delete_addons' => true)); + $array = $this->api_admin->order_get_list(array()); + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } } \ No newline at end of file diff --git a/tests/integration/bb-modules/mod_staff/Api_AdminTest.php b/tests/integration/bb-modules/mod_staff/Api_AdminTest.php index f397a5a68..01b8ca66e 100644 --- a/tests/integration/bb-modules/mod_staff/Api_AdminTest.php +++ b/tests/integration/bb-modules/mod_staff/Api_AdminTest.php @@ -167,5 +167,17 @@ class Api_Admin_StaffTest extends BBDbApiTestCase $this->assertArrayHasKey('created_at', $item); $this->assertArrayHasKey('updated_at', $item); } + public function testBatchDelete() + { + $array = $this->api_admin->staff_login_history_get_list(array()); + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->staff_batch_delete_logs(array('ids' => $ids)); + $array = $this->api_admin->staff_login_history_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } } \ No newline at end of file diff --git a/tests/integration/bb-modules/mod_support/Api_AdminTest.php b/tests/integration/bb-modules/mod_support/Api_AdminTest.php index 9cd1356cc..78aa02212 100644 --- a/tests/integration/bb-modules/mod_support/Api_AdminTest.php +++ b/tests/integration/bb-modules/mod_support/Api_AdminTest.php @@ -290,4 +290,32 @@ class Api_Admin_SupportTest extends BBDbApiTestCase $this->assertInternalType('array', $item['client']); } } + + public function testTicketBatchDelete() + { + $array = $this->api_admin->support_ticket_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->support_batch_delete(array('ids' => $ids)); + $array = $this->api_admin->support_ticket_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } + + public function testPublicTicketBatchDelete() + { + $array = $this->api_admin->support_public_ticket_get_list(array()); + + foreach ($array['list'] as $value) { + $ids[] = $value['id']; + } + $result = $this->api_admin->support_batch_delete_public(array('ids' => $ids)); + $array = $this->api_admin->support_public_ticket_get_list(array()); + + $this->assertEquals(0, count($array['list'])); + $this->assertTrue($result); + } } \ No newline at end of file