fix email template variables

the email templates do not get populated with the correct variables into the template, resulting in the email being generated with empty variable fields.

src/bb-modules/Email/Service.php

@@ -283,14 +283,10 @@ private function _getVarsString()
         return $str;
     }
 
-    private function _parse($t, $vars)
+    private function _parse(\Model_EmailTemplate $t, $vars)
     {
-        $dd = $vars;
-        $pc = $this->di['twig']->render($t->content);
-
-        $dd = $vars;
-        $ps = $this->di['twig']->render($t->subject);
-
+        $pc = $this->di['twig']->render($t->content, $vars);
+        $ps = $this->di['twig']->render($t->subject, $vars);
         return array($ps, $pc);
     }
 

tests/integration/bb-modules/mod_email/Api_AdminTest.php

@@ -152,6 +152,30 @@ public function testTemplateGeneralSend()
 
         $bool = $this->api_admin->email_template_send($params);
         $this->assertTrue($bool);
+
+    }
+
+    public function testTemplate_populateVariables()
+    {
+        $params = array();
+        $params['to'] = 'client@boxbilling.com';
+        $params['to_name'] = 'Client PHPUnit';
+
+        $params['code'] = 'mod_client_signup';
+
+        $params['default_template'] = 'Hello, message from {{ admin.client_get({"id":client_id}).first_name }}, {{subject}}';
+        $params['default_subject'] = 'My subject for client';
+
+        $params['to_client'] = 1;
+
+        $bool = $this->api_admin->email_template_send($params);
+        $this->assertTrue($bool);
+
+        $emailModel = $this->di['db']->findOne('ModEmailQueue', ' order by id desc');
+
+        $clientModel = $this->di['db']->load('Client', $params['to_client']);
+
+        $this->assertTrue(strpos($emailModel->subject, $clientModel->first_name) !== false, 'Template variables were not populated');
     }
 
     public function testSendToClient()