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
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
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