Merge branch 'master' of github.com:akaunting/akaunting
This commit is contained in:
		@@ -16,7 +16,7 @@ class Dropzone
 | 
				
			|||||||
     */
 | 
					     */
 | 
				
			||||||
    public function handle($request, Closure $next)
 | 
					    public function handle($request, Closure $next)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        if (($request->method() != 'POST') && ($request->method() != 'PATCH')) {
 | 
					        if (!in_array($request->method(), ['POST', 'PATCH'])) {
 | 
				
			||||||
            return $next($request);
 | 
					            return $next($request);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -144,18 +144,16 @@ export default {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                        if (file.type.indexOf("image") == -1) {
 | 
					                        if (file.type.indexOf("image") == -1) {
 | 
				
			||||||
                            var ext = file.name.split('.').pop();
 | 
					                            var ext = file.name.split('.').pop();
 | 
				
			||||||
 | 
					                            
 | 
				
			||||||
 | 
					                            file.previewElement.querySelector("[data-dz-thumbnail]").classList.add("d-none");
 | 
				
			||||||
 | 
					                            
 | 
				
			||||||
                            if (ext == "pdf") {
 | 
					                            if (ext == "pdf") {
 | 
				
			||||||
                                file.previewElement.querySelector("[data-dz-thumbnail]").classList.add("d-none");
 | 
					 | 
				
			||||||
                                file.previewElement.querySelector("[data-dz-thumbnail-pdf]").classList.remove("d-none");
 | 
					                                file.previewElement.querySelector("[data-dz-thumbnail-pdf]").classList.remove("d-none");
 | 
				
			||||||
                            } else if ((ext.indexOf("doc") != -1) || (ext.indexOf("docx") != -1)) {
 | 
					                            } else if ((ext.indexOf("doc") != -1) || (ext.indexOf("docx") != -1)) {
 | 
				
			||||||
                                file.previewElement.querySelector("[data-dz-thumbnail]").classList.add("d-none");
 | 
					 | 
				
			||||||
                                file.previewElement.querySelector("[data-dz-thumbnail-word]").classList.remove("d-none");
 | 
					                                file.previewElement.querySelector("[data-dz-thumbnail-word]").classList.remove("d-none");
 | 
				
			||||||
                            } else if ((ext.indexOf("xls") != -1) || (ext.indexOf("xlsx") != -1)) {
 | 
					                            } else if ((ext.indexOf("xls") != -1) || (ext.indexOf("xlsx") != -1)) {
 | 
				
			||||||
                                file.previewElement.querySelector("[data-dz-thumbnail]").classList.add("d-none");
 | 
					 | 
				
			||||||
                                file.previewElement.querySelector("[data-dz-thumbnail-excel]").classList.remove("d-none");
 | 
					                                file.previewElement.querySelector("[data-dz-thumbnail-excel]").classList.remove("d-none");
 | 
				
			||||||
                            } else {
 | 
					                            } else {
 | 
				
			||||||
                                file.previewElement.querySelector("[data-dz-thumbnail]").classList.add("d-none");
 | 
					 | 
				
			||||||
                                file.previewElement.querySelector("[data-dz-thumbnail-image]").classList.remove("d-none");
 | 
					                                file.previewElement.querySelector("[data-dz-thumbnail-image]").classList.remove("d-none");
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user