Merge remote-tracking branch 'AkauntingOrigin/master'

app/Traits/DateTime.php

@@ -3,6 +3,7 @@
 namespace App\Traits;
 
 use App\Traits\SearchString;
+use Carbon\CarbonPeriod;
 use Date;
 
 trait DateTime
@@ -109,14 +110,32 @@ trait DateTime
 
         $financial_start = Date::create($year, $month, $day);
 
-        // Check if FS is in last calendar year
-        if ($now->diffInDays($financial_start, false) > 0) {
+        if ((setting('localisation.financial_denote') == 'ends') && ($financial_start->dayOfYear != 1)) {
             $financial_start->subYear();
         }
 
         return $financial_start;
     }
 
+    public function getFinancialYear($year = null)
+    {
+        $start = $this->getFinancialStart($year);
+
+        return CarbonPeriod::create($start, $start->copy()->addYear()->subDay());
+    }
+
+    public function getFinancialQuarters($year = null)
+    {
+        $quarters = [];
+        $start = $this->getFinancialStart($year);
+
+        for ($i = 0; $i < 4; $i++) {
+            $quarters[] = CarbonPeriod::create($start->copy()->addQuarters($i), $start->copy()->addQuarters($i + 1)->subDay());
+        }
+
+        return $quarters;
+    }
+
     public function getMonthlyDateFormat($year = null)
     {
         $format = 'M';

app/Traits/Omnipay.php

@@ -145,7 +145,7 @@ trait Omnipay
 
         $invoice_url = $this->getInvoiceUrl($invoice);
 
-        flash($message)->error();
+        flash($message)->error()->important();
 
         if ($force_redirect) {
             return redirect($invoice_url);

app/Traits/Uploads.php

@@ -3,10 +3,10 @@
 namespace App\Traits;
 
 use MediaUploader;
+use App\Models\Common\Media as MediaModel;
 
 trait Uploads
 {
-
     public function getUploadedFilePath($file, $folder = 'settings', $company_id = null)
     {
         $path = '';
@@ -63,4 +63,35 @@ trait Uploads
 
         return MediaUploader::importPath($disk, $path);
     }
+
+    public function deleteMediaModel($model, $parameter, $request = null)
+    {
+        $medias = $model->$parameter;
+
+        if (!$medias) {
+            return;
+        }
+
+        $already_uploaded = [];
+
+        if ($request && isset($request['uploaded_' . $parameter])) {
+            $uploaded = $request['uploaded_' . $parameter];
+
+            if (count($medias) == count($uploaded)) {
+                return;
+            }
+
+            foreach ($uploaded as $old_media) {
+                $already_uploaded[] = $old_media['id'];
+            }
+        }
+
+        foreach ((array)$medias as $media) {
+            if (in_array($media->id, $already_uploaded)) {
+                continue;
+            }
+
+            MediaModel::where('id', $media->id)->delete();
+        }
+    }
 }