Merge pull request #903 from openclassify/muammertop

#3002 maabir pdf.rar

addons/default/visiosoft/advs-module/migrations/2021_01_06_110331_visiosoft.module.advs__add_doc-files_field.php

@@ -0,0 +1,26 @@
+<?php
+
+use Anomaly\Streams\Platform\Database\Migration\Migration;
+
+class VisiosoftModuleAdvsAddDocFilesField extends Migration
+{
+	protected $delete = false;
+
+	protected $stream = [
+		'slug' => 'advs',
+	];
+
+	protected $fields = [
+		'doc_files' => [
+			'type' => 'visiosoft.field_type.media',
+			'config' => [
+				'folders' => ["ads_documents"],
+				'mode' => 'upload',
+			],
+		],
+	];
+
+	protected $assignments = [
+		'doc_files'
+	];
+}

addons/default/visiosoft/advs-module/resources/lang/en/field.php

@@ -319,6 +319,7 @@ return [
     'congratulations' => 'Congratulations',
     'ad_desc' => 'Ad Description',
     'upload_photos' => 'Upload Photos',
+    'upload_files' => 'Upload Files',
     'additional_fields' => 'Additional Fields',
     'ad_location' => 'Ad Location',
 

addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig

@@ -36,6 +36,12 @@
             </div>
             <!--detail-ad -->
 
+            <ul class="docs list-unstyled">
+                {% for doc in adv.doc_files %}
+                    <li><a class="text-dark small" href="{{ doc.url }}"><i class="fa fa-lg fa-download small"></i> {{ doc.name }}</a></li>
+                {% endfor %}
+            </ul>
+
             {% if setting_value('visiosoft.theme.base::ad_details_tab') %}
 
                 {% if blocks('ad-item-content-block-area') is null %}

addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig

@@ -178,6 +178,15 @@
                                 <div class="row form-group images">
                                     <div class="col-md-12">
                                         {{ form.fields.files.input |raw }}
+                                        <input name="doc_files" value="{{ form.fields.doc_files.value.pluck('id').all()|join(',') }}" hidden>
+                                        {% for docs in form.fields.doc_files.value %}
+                                            <div class="doc_list small">
+                                                {{ docs.name }}
+                                                <a id="{{ docs.id }}" href="javascript:void(0)" onclick="deleteDocs({{ docs.id }})" class="text-dark">
+                                                    <i class="fa fa-trash text-danger"></i>
+                                                </a><br>
+                                            </div>
+                                        {% endfor %}
                                     </div>
                                 </div>
                             </div>

addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php

@@ -53,6 +53,7 @@ class AdvFormBuilder extends FormBuilder
             'class' => 'hidden d-none mapVal'
         ],
         'files',
+	    'doc_files',
 	    'popular_adv',
         'adv_day',
 	     'product_options_value'

addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php

@@ -1,5 +1,6 @@
 <?php namespace Visiosoft\AdvsModule\Http\Controller;
 
+use Anomaly\FilesModule\File\Contract\FileRepositoryInterface;
 use Anomaly\SettingsModule\Setting\Contract\SettingRepositoryInterface;
 use Anomaly\Streams\Platform\Http\Controller\PublicController;
 use Anomaly\Streams\Platform\Message\MessageBag;

addons/default/visiosoft/media-field_type/resources/js/upload.js

@@ -3,6 +3,7 @@ Dropzone.autoDiscover = false;
 $("div#myDrop").dropzone({url: "/file/post"});
 
 var uploaded = $('input[name="files"]').val().split(',').map(Number);
+var docsUploaded = $('input[name="doc_files"]').val().split(',').map(Number);
 
 $(function () {
 
@@ -67,7 +68,8 @@ $(function () {
     dropzone.on('success', function (file) {
 
         var response = JSON.parse(file.xhr.response);
-
+        var mimeType = response.mime_type.split('/')
+        if (mimeType[0] === 'image'){
             uploaded.push(response.id);
 
             $('.media-selected-wrapper').load(
@@ -84,6 +86,10 @@ $(function () {
                 addAppendByData(uploaded[0])
                 file.previewElement.remove();
             }, 500);
+        } else {
+            docsUploaded.push(response.id);
+            $('input[name="doc_files"]').val(docsUploaded.join(','))
+        }
     });
 
     // When file fails to upload.
@@ -109,6 +115,13 @@ function deleteImage(e, id) {
     $('.imageList').find('div[data-id="' + id + '"]').remove()
 }
 
+function deleteDocs(id) {
+    var key_item = $.inArray(id, docsUploaded);
+    docsUploaded.splice(key_item, 1);
+    $('input[name="doc_files"]').val(docsUploaded.join(','))
+    $('.doc_list').find('#' + id).remove()
+}
+
 function rotateImage(e, id) {
     e.preventDefault()
 

addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php

@@ -50,8 +50,17 @@ class UploadController extends AdminController
 
     public function upload()
     {
+	    $doc_folder = app(FolderRepositoryInterface::class)->findBySlug('ads_documents')->id;
+	    $mimes = explode('/', $this->request->file('upload')->getMimeType());
+
+		if ($mimes[0] == 'image'){
 			$file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder')));
+		} else {
+			$file  = $this->uploader->upload($this->request->file('upload'), $this->folders->find($doc_folder));
+		}
+
         if ($file) {
+			if ($mimes[0] == 'image'){
 
 				$settings_key = [
 					'image_resize_backend',
@@ -138,6 +147,7 @@ class UploadController extends AdminController
 					}
 					$image->save(app_storage_path() . '/files-module/local/images/' . $fileName);
 				}
+			}
             return $this->response->json($file->getAttributes());
         }
 
@@ -173,7 +183,7 @@ class UploadController extends AdminController
         return response()->json(['status' => 'error']);
     }
 
-    public function createFile($folder, $filename, $image)
+	public function createFile($folder, $filename, $image = null)
 	{
 		$this->files->create([
 			'folder_id' => $folder,

database/seeds/DatabaseSeeder.php

@@ -174,5 +174,23 @@ class DatabaseSeeder extends Seeder
                 ],
             ]);
         };
+
+
+		//Create Ads Documents Folder
+		if (!$this->folders->findBySlug('ads_documents')) {
+			$disk = $this->disks->findBySlug('local');
+
+			$this->folders->create([
+				'en' => [
+					'name' => 'Ads Documents',
+					'description' => 'A folder for Ads Documents.',
+				],
+				'slug' => 'ads_documents',
+				'disk' => $disk,
+				'allowed_types' => [
+					'pdf', 'doc', 'docx', 'xls', 'xlsx',
+				],
+			]);
+		};
 	}
 }