change icons, css, add routing to merchandise, add mail templater, fixes

app/Http/Controllers/Admin/Core/Mail/Controller.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Core\Mail;
+
+use App\Http\Controllers\Controller as ParentController;
+
+class Controller extends ParentController
+{
+}

app/Http/Controllers/Admin/Core/Mail/MailLogController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Core\Mail;
+
+use App\Datatables\Admin\Core\Mail\MailLogsDataTable;
+use App\Repositories\Core\Mail\MailLogs;
+
+class MailLogController extends Controller
+{
+    public function __construct()
+    {
+        // $this->middleware('ability:admin');
+    }
+
+    public function index(MailLogsDataTable $dataTable)
+    {
+        return $dataTable->render('admin.Core.Mail.MailLog.index', $data ?? []);
+    }
+
+    public function show($id)
+    {
+        $data['message'] = MailLogs::getParsed($id);
+
+        return view('admin.Core.Mail.MailLog.modal', $data);
+    }
+}

app/Http/Controllers/Admin/Core/Mail/MailTemplateController.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Core\Mail;
+
+use App\Datatables\Admin\Core\Mail\MailTemplatesDataTable;
+use App\Repositories\Core\Mail\MailTemplates;
+use Illuminate\Http\Request;
+
+class MailTemplateController extends Controller
+{
+    public function __construct()
+    {
+        // $this->middleware('ability:admin');
+    }
+
+    public function index(MailTemplatesDataTable $dataTable)
+    {
+        return $dataTable->render('Admin.Core.Mail.MailTemplate.index', $data ?? []);
+    }
+
+    public function modalCreate()
+    {
+        $data = MailTemplates::init();
+        return view('Admin.Core.Mail.MailTemplate.modal', $data ?? []);
+    }
+
+    public function modalEdit($id = false)
+    {
+        $data = MailTemplates::init();
+        $data['mail_template'] = MailTemplates::edit($id);
+
+        return view('Admin.Core.Mail.MailTemplate.modal', $data);
+    }
+
+    public function storeAjax(Request $request)
+    {
+        $data = $request->all();
+        unset($data['proengsoft_jsvalidation']);
+        $ret = MailTemplates::store($data);
+
+        return response()->json(['error' => 0]);
+    }
+
+    public function destroy(Request $request, $id = false)
+    {
+        $id = $id ?? $request->input('id');
+        MailTemplates::destroy($id);
+
+        return response()->json(['error' => 0]);
+    }
+
+    public function getVarsByMailable($mailable)
+    {
+        $data['vars'] = MailTemplates::getVarsByMailable($mailable);
+
+        return view('Admin.Core.Mail.MailTemplate.partials.vars', $data);
+    }
+
+    public function preview($template_id, $user_id)
+    {
+        return MailTemplates::preview($template_id, $user_id);
+    }
+
+    public function modalPreview($template_id)
+    {
+        $data = MailTemplates::getDataFormodalPreview($template_id);
+
+        return view('Admin.Core.Mail.MailTemplate.partials.modalPreview', $data);
+    }
+}

app/Http/Controllers/Admin/Shop/ArticleNatureController.php

@@ -34,6 +34,9 @@ class ArticleNatureController extends Controller
     public function edit($id)
     {
         $data['article_nature'] = ArticleNatures::get($id);
+        $data['product_types'] = ArticleNatures::getProductTypes();
+        // dump($data);
+        // exit;
         return view('Admin.Shop.ArticleNatures.edit', $data);
     }
 
@@ -42,8 +45,9 @@ class ArticleNatureController extends Controller
         return ArticleNatures::destroy($id);
     }
 
-    public static function getOptions($product_type)
+    public static function getOptions(Request $request)
     {
-        return response()->json(['0' => ''] + ArticleNatures::getOptionsByProductType($product_type));
+        $data = ArticleNatures::getOptionsByProductTypeModel($request->input('product_type'));
+        return response()->json(['0' => ''] + $data);
     }
 }