Merge pull request #365 from ivandiazwm/master

Email template fix

build.sh

@@ -4,8 +4,10 @@ gulp prod --api
 rm build/index.html
 echo "2/3 Creating api folder..."
 cd ../server
-rm -rf files
-mkdir files
+mkdir files2
+mv files/.htaccess files2
+rm -rf files/
+mv files2 files
 cd ..
 mkdir api
 cp server/index.php api
@@ -17,8 +19,7 @@ cp -R server/data api
 cp -R server/libs api
 cp -R server/models api
 cp -R server/vendor api
-mkdir api/files
-touch api/files/.keep
+cp -R server/files api
 echo -n > api/config.php
 chmod -R 755 .
 echo "3/3 Generating zip..."

server/controllers/system/edit-mail-template.php

@@ -24,7 +24,7 @@ use Respect\Validation\Validator as DataValidator;
  * @apiUse INVALID_SUBJECT
  * @apiUse INVALID_BODY
  *
- * @apiSuccess {Object} data Empty object 
+ * @apiSuccess {Object} data Empty object
  *
  */
 
@@ -60,18 +60,16 @@ class EditMailTemplateController extends Controller {
         $language = Controller::request('language');
         $templateType = Controller::request('templateType');
         $subject = Controller::request('subject', true);
-        $body = Controller::request('body', true);
+        $body = Controller::request('body');
 
         $mailTemplate = MailTemplate::findOne(' language = ? AND type = ?', [$language, $templateType]);
         if($mailTemplate->isNull()) {
-            Response::respondError(ERRORS::INVALID_TEMPLATE);
-            return;
+            throw new Exception(ERRORS::INVALID_TEMPLATE);
         }
         $mailTemplate->subject = $subject;
         $mailTemplate->body = $body;
         $mailTemplate->store();
 
         Response::respondSuccess();
-
     }
-}
+}