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 @@
-
+ {% 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 @@
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 @@
{% 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 @@
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 @@
+ {% 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 @@
-
+{% 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 @@