Merge pull request #1842 from cuneytsenturk/master

File group drag and drop developement

app/Http/Controllers/Purchases/Payments.php

@@ -66,7 +66,17 @@ class Payments extends Controller
 
         $payment_methods = Modules::getPaymentMethods();
 
-        return view('purchases.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods'));
+        $file_type_mimes = explode(',', config('filesystems.mimes'));
+
+        $file_types = [];
+
+        foreach ($file_type_mimes as $mime) {
+            $file_types[] = '.' . $mime;
+        }
+
+        $file_types = implode(',', $file_types);
+
+        return view('purchases.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods', 'file_types'));
     }
 
     /**
@@ -166,7 +176,17 @@ class Payments extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('purchases.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format'));
+        $file_type_mimes = explode(',', config('filesystems.mimes'));
+
+        $file_types = [];
+
+        foreach ($file_type_mimes as $mime) {
+            $file_types[] = '.' . $mime;
+        }
+
+        $file_types = implode(',', $file_types);
+
+        return view('purchases.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format', 'file_types'));
     }
 
     /**

app/Http/Controllers/Sales/Revenues.php

@@ -66,7 +66,17 @@ class Revenues extends Controller
 
         $payment_methods = Modules::getPaymentMethods();
 
-        return view('sales.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods'));
+        $file_type_mimes = explode(',', config('filesystems.mimes'));
+
+        $file_types = [];
+
+        foreach ($file_type_mimes as $mime) {
+            $file_types[] = '.' . $mime;
+        }
+
+        $file_types = implode(',', $file_types);
+
+        return view('sales.revenues.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'customers', 'categories', 'payment_methods', 'file_types'));
     }
 
     /**
@@ -166,7 +176,17 @@ class Revenues extends Controller
 
         $date_format = $this->getCompanyDateFormat();
 
-        return view('sales.revenues.edit', compact('revenue', 'accounts', 'currencies', 'currency', 'customers', 'categories', 'payment_methods', 'date_format'));
+        $file_type_mimes = explode(',', config('filesystems.mimes'));
+
+        $file_types = [];
+
+        foreach ($file_type_mimes as $mime) {
+            $file_types[] = '.' . $mime;
+        }
+
+        $file_types = implode(',', $file_types);
+
+        return view('sales.revenues.edit', compact('revenue', 'accounts', 'currencies', 'currency', 'customers', 'categories', 'payment_methods', 'date_format', 'file_types'));
     }
 
     /**

app/Http/Kernel.php

@@ -148,6 +148,7 @@ class Kernel extends HttpKernel
         'company.currencies' => \App\Http\Middleware\LoadCurrencies::class,
         'company.settings' => \App\Http\Middleware\LoadSettings::class,
         'company.signed' => \App\Http\Middleware\SignedCompany::class,
+        'dropzone' => \App\Http\Middleware\Dropzone::class,
         'header.x' => \App\Http\Middleware\AddXHeader::class,
         'menu.admin' => \App\Http\Middleware\AdminMenu::class,
         'menu.portal' => \App\Http\Middleware\PortalMenu::class,

app/Http/Middleware/Dropzone.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Arr;
+
+class Dropzone
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (($request->method() != 'POST') && ($request->method() != 'PATCH')) {
+            return $next($request);
+        }
+
+        $multiple = false;
+
+        foreach ($request->all() as $key => $value) {
+            if (!is_array($value)) {
+                continue;
+            }
+
+            $files = [];
+            $uploaded = [];
+
+            foreach ($value as $index => $parameter) {
+                // single file uploaded..
+                if (!is_array($parameter) && !$multiple) {
+                    if (!Arr::has($value, 'dropzone')) {
+                        continue;
+                    }
+
+                    $request->request->set('uploaded_' . $key, $value);
+
+                    unset($request[$key]);
+                    break;
+                }
+
+                // multiple file uploaded..
+                if (!Arr::has($parameter, 'dropzone')) {
+                    $files[] = $parameter;
+
+                    continue;
+                }
+
+                $multiple = true;
+                $uploaded[] = $parameter;
+            }
+
+            if ($multiple && $uploaded) {
+                $request->request->set('uploaded_' . $key, $uploaded);
+                $request->request->set($key, $files);
+            }
+        }
+
+        return $next($request);
+    }
+}

app/Http/Requests/Banking/Transaction.php

@@ -41,7 +41,7 @@ class Transaction extends FormRequest
             'contact_id' => 'nullable|integer',
             'category_id' => 'required|integer',
             'payment_method' => 'required|string',
-            'attachment' => $attachment,
+            'attachment.*' => $attachment,
         ];
     }