refs #164 models update

akaunting · Jan 10, 2018 · 87b327d · 87b327d
1 parent e65743c
commit 87b327d
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 48 deletions.
diff --git a/app/Listeners/Updates/Version117.php b/app/Listeners/Updates/Version117.php
@@ -3,6 +3,8 @@
 namespace App\Listeners\Updates;
 
 use App\Events\UpdateFinished;
+use App\Models\Auth\Role;
+use App\Models\Auth\Permission;
 use MediaUploader;
 use Storage;
 use Artisan;
@@ -26,6 +28,26 @@ public function handle(UpdateFinished $event)
             return;
         }
 
+        // Create permission
+        $permission = Permission::firstOrCreate([
+            'name' => 'delete-common-uploads',
+            'display_name' => 'Delete Common Uploads',
+            'description' => 'Delete Common Uploads',
+        ]);
+
+        // Attach permission to roles
+        $roles = Role::all();
+
+        foreach ($roles as $role) {
+            $allowed = ['admin'];
+
+            if (!in_array($role->name, $allowed)) {
+                continue;
+            }
+
+            $role->attachPermission($permission);
+        }
+
         $data = [];
 
         $migrations = [
@@ -77,23 +99,39 @@ public function handle(UpdateFinished $event)
             }
         }
 
-        $settings['company_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.company_logo')->get();
-        $settings['invoice_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.invoice_logo')->get();
+        $settings['company_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.company_logo')->where('company_id', '<>', '0')->get();
+        $settings['invoice_logo'] = \App\Models\Setting\Setting::where('key', '=', 'general.invoice_logo')->where('company_id', '<>', '0')->get();
+
+        foreach ($settings as $name => $items) {
+            foreach ($items as $item) {
+                if ($item->value) {
+                    $path = explode('uploads/', $item->value);
+
+                    $path = end($path);
 
-        foreach ($settings as $name => $item) {
-            if ($item->value) {
-                $path = explode('uploads/', $item->value);
+                    if (!empty($item->company_id) && (strpos($path, $item->company_id . '/') === false)) {
+                        $path = $item->company_id . '/' . $path;
+                    }
 
-                $path = end($path);
+                    if (!empty($path) && Storage::exists($path)) {
+                        $company = \App\Models\Company\Company::find($item->company_id);
 
-                if (!empty($item->company_id) && (strpos($path, $item->company_id . '/') === false)) {
-                    $path = $item->company_id . '/' . $path;
-                }
+                        $media = \App\Models\Common\Media::where('filename', '=',  pathinfo(basename($path), PATHINFO_FILENAME))->first();
 
-                if (!empty($path) && Storage::exists($path)) {
-                    $media = MediaUploader::importPath(config('mediable.default_disk'), $path);
+                        if ($company && !$media) {
+                            $media = MediaUploader::importPath(config('mediable.default_disk'), $path);
 
-                    $item->attachMedia($media, $name);
+                            $company->attachMedia($media, $name);
+
+                            $item->update(['value' => $media->id]);
+                        } elseif ($media) {
+                            $item->update(['value' => $media->id]);
+                        } else {
+                            $item->update(['value' => '']);
+                        }
+                    } else {
+                        $item->update(['value' => '']);
+                    }
                 }
             }
         }

diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
@@ -88,11 +88,9 @@ public function getPictureAttribute($value)
             }
         }
 
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('picture')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('picture')) {
+        } elseif (!$this->hasMedia('picture')) {
             return false;
         }
 

diff --git a/app/Models/Company/Company.php b/app/Models/Company/Company.php
@@ -238,11 +238,9 @@ public function emailSortable($query, $direction)
      */
     public function getCompanyLogoAttribute($value)
     {
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('company_logo')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('company_logo')) {
+        } elseif (!$this->hasMedia('company_logo')) {
             return false;
         }
 

diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php
@@ -137,11 +137,9 @@ public function setCurrencyRateAttribute($value)
      */
     public function getAttachmentAttribute($value)
     {
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('attachment')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('attachment')) {
+        } elseif (!$this->hasMedia('attachment')) {
             return false;
         }
 

diff --git a/app/Models/Expense/BillPayment.php b/app/Models/Expense/BillPayment.php
@@ -87,11 +87,9 @@ public function scopePaid($query)
      */
     public function getAttachmentAttribute($value)
     {
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('attachment')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('attachment')) {
+        } elseif (!$this->hasMedia('attachment')) {
             return false;
         }
 

diff --git a/app/Models/Expense/Payment.php b/app/Models/Expense/Payment.php
@@ -100,11 +100,9 @@ public static function scopeLatest($query)
      */
     public function getAttachmentAttribute($value)
     {
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('attachment')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('attachment')) {
+        } elseif (!$this->hasMedia('attachment')) {
             return false;
         }
 

diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php
@@ -146,11 +146,9 @@ public function setCurrencyRateAttribute($value)
      */
     public function getAttachmentAttribute($value)
     {
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('attachment')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('attachment')) {
+        } elseif (!$this->hasMedia('attachment')) {
             return false;
         }
 

diff --git a/app/Models/Income/InvoicePayment.php b/app/Models/Income/InvoicePayment.php
@@ -87,11 +87,9 @@ public function scopePaid($query)
      */
     public function getAttachmentAttribute($value)
     {
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('attachment')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('attachment')) {
+        } elseif (!$this->hasMedia('attachment')) {
             return false;
         }
 

diff --git a/app/Models/Income/Revenue.php b/app/Models/Income/Revenue.php
@@ -106,11 +106,9 @@ public function scopeLatest($query)
      */
     public function getAttachmentAttribute($value)
     {
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('attachment')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('attachment')) {
+        } elseif (!$this->hasMedia('attachment')) {
             return false;
         }
 

diff --git a/app/Models/Item/Item.php b/app/Models/Item/Item.php
@@ -120,11 +120,9 @@ public function categorySortable($query, $direction)
      */
     public function getPictureAttribute($value)
     {
-        if (!empty($value)) {
+        if (!empty($value) && !$this->hasMedia('picture')) {
             return $value;
-        }
-
-        if (!$this->hasMedia('picture')) {
+        } elseif (!$this->hasMedia('picture')) {
             return false;
         }
 

diff --git a/app/Models/Setting/Setting.php b/app/Models/Setting/Setting.php
@@ -10,6 +10,8 @@ class Setting extends Model
 
     protected $table = 'settings';
 
+    public $timestamps = false;
+
     /**
      * Attributes that should be mass-assignable.
      *