Merge branch '2.1-dev' of github.com:akaunting/akaunting into 2.1-dev

app/Abstracts/Export.php

@@ -34,7 +34,7 @@ abstract class Export implements FromCollection, ShouldAutoSize, WithHeadings, W
     {
         $map = [];
 
-        $date_fields = ['paid_at', 'invoiced_at', 'billed_at', 'due_at', 'issued_at', 'created_at'];
+        $date_fields = ['paid_at', 'invoiced_at', 'billed_at', 'due_at', 'issued_at', 'created_at', 'transferred_at'];
 
         $evil_chars = ['=', '+', '-', '@'];
 

app/Abstracts/Http/ApiController.php

@@ -2,13 +2,27 @@
 
 namespace App\Abstracts\Http;
 
+use App\Traits\Jobs;
+use App\Traits\Permissions;
+use App\Traits\Relationships;
 use Dingo\Api\Exception\ResourceException;
 use Dingo\Api\Routing\Helpers;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Controller as BaseController;
 
-abstract class ApiController extends Controller
+abstract class ApiController extends BaseController
 {
-    use Helpers;
+    use AuthorizesRequests, Jobs, Helpers, Permissions, Relationships, ValidatesRequests;
+
+    /**
+     * Instantiate a new controller instance.
+     */
+    public function __construct()
+    {
+        $this->assignPermissionsToController();
+    }
 
     /**
      * Create the response for when a request fails validation.

app/Abstracts/Http/Controller.php

@@ -4,6 +4,7 @@ namespace App\Abstracts\Http;
 
 use App\Abstracts\Http\Response;
 use App\Traits\Jobs;
+use App\Traits\Permissions;
 use App\Traits\Relationships;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -11,73 +12,17 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Routing\Route;
-use Illuminate\Support\Str;
 
 abstract class Controller extends BaseController
 {
-    use AuthorizesRequests, Jobs, Relationships, ValidatesRequests;
+    use AuthorizesRequests, Jobs, Permissions, Relationships, ValidatesRequests;
 
     /**
      * Instantiate a new controller instance.
      */
     public function __construct()
     {
-        $this->setPermissions();
+        $this->assignPermissionsToController();
-    }
-
-    /**
-     * Assign permissions to methods.
-     *
-     * @return void
-     */
-    public function setPermissions()
-    {
-        // No need to check for permission in console
-        if (app()->runningInConsole()) {
-            return;
-        }
-
-        $route = app(Route::class);
-
-        // Get the controller array
-        $arr = array_reverse(explode('\\', explode('@', $route->getAction()['uses'])[0]));
-
-        $controller = '';
-
-        // Add module
-        if (isset($arr[3]) && isset($arr[4])) {
-            if (strtolower($arr[4]) == 'modules') {
-                $controller .= Str::kebab($arr[3]) . '-';
-            } elseif (isset($arr[5]) && (strtolower($arr[5]) == 'modules')) {
-                $controller .= Str::kebab($arr[4]) . '-';
-            }
-        }
-
-        // Add folder
-        if (strtolower($arr[1]) != 'controllers') {
-            $controller .= Str::kebab($arr[1]) . '-';
-        }
-
-        // Add file
-        $controller .= Str::kebab($arr[0]);
-
-        // Skip ACL
-        $skip = ['portal-dashboard'];
-        if (in_array($controller, $skip)) {
-            return;
-        }
-
-        // App\Http\Controllers\FooBar                  -->> foo-bar
-        // App\Http\Controllers\FooBar\Main             -->> foo-bar-main
-        // Modules\Blog\Http\Controllers\Posts          -->> blog-posts
-        // Modules\Blog\Http\Controllers\Portal\Posts   -->> blog-portal-posts
-
-        // Add CRUD permission check
-        $this->middleware('permission:create-' . $controller)->only('create', 'store', 'duplicate', 'import');
-        $this->middleware('permission:read-' . $controller)->only('index', 'show', 'edit', 'export');
-        $this->middleware('permission:update-' . $controller)->only('update', 'enable', 'disable');
-        $this->middleware('permission:delete-' . $controller)->only('destroy');
     }
 
     /**

app/Abstracts/Import.php

@@ -39,7 +39,7 @@ abstract class Import implements ToModel, SkipsOnError, SkipsOnFailure, WithBatc
             $row['reconciled'] = (int) $row['reconciled'];
         }
 
-        $date_fields = ['paid_at', 'invoiced_at', 'billed_at', 'due_at', 'issued_at', 'created_at'];
+        $date_fields = ['paid_at', 'invoiced_at', 'billed_at', 'due_at', 'issued_at', 'created_at', 'transferred_at'];
         foreach ($date_fields as $date_field) {
             if (!isset($row[$date_field])) {
                 continue;

app/Exports/Banking/Transfers.php

@@ -5,8 +5,10 @@ namespace App\Exports\Banking;
 use App\Abstracts\Export;
 use App\Models\Banking\Transfer as Model;
 use App\Utilities\Date;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
-class Transfers extends Export
+class Transfers extends Export implements WithColumnFormatting
 {
     public function collection()
     {
@@ -57,4 +59,11 @@ class Transfers extends Export
             'reference',
         ];
     }
+
+    public function columnFormats(): array
+    {
+        return [
+            'A' => NumberFormat::FORMAT_DATE_YYYYMMDD,
+        ];
+    }
 }

app/Exports/Purchases/Sheets/BillTransactions.php

@@ -4,8 +4,10 @@ namespace App\Exports\Purchases\Sheets;
 
 use App\Abstracts\Export;
 use App\Models\Banking\Transaction as Model;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
-class BillTransactions extends Export
+class BillTransactions extends Export implements WithColumnFormatting
 {
     public function collection()
     {
@@ -51,4 +53,11 @@ class BillTransactions extends Export
             'reconciled',
         ];
     }
+
+    public function columnFormats(): array
+    {
+        return [
+            'B' => NumberFormat::FORMAT_DATE_YYYYMMDD,
+        ];
+    }
 }

app/Exports/Purchases/Sheets/Bills.php

@@ -4,8 +4,10 @@ namespace App\Exports\Purchases\Sheets;
 
 use App\Abstracts\Export;
 use App\Models\Purchase\Bill as Model;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
-class Bills extends Export
+class Bills extends Export implements WithColumnFormatting
 {
     public function collection()
     {
@@ -46,4 +48,12 @@ class Bills extends Export
             'footer',
         ];
     }
+
+    public function columnFormats(): array
+    {
+        return [
+            'D' => NumberFormat::FORMAT_DATE_YYYYMMDD,
+            'E' => NumberFormat::FORMAT_DATE_YYYYMMDD,
+        ];
+    }
 }

app/Exports/Sales/Sheets/InvoiceTransactions.php

@@ -4,8 +4,10 @@ namespace App\Exports\Sales\Sheets;
 
 use App\Abstracts\Export;
 use App\Models\Banking\Transaction as Model;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
-class InvoiceTransactions extends Export
+class InvoiceTransactions extends Export implements WithColumnFormatting
 {
     public function collection()
     {
@@ -51,4 +53,11 @@ class InvoiceTransactions extends Export
             'reconciled',
         ];
     }
+
+    public function columnFormats(): array
+    {
+        return [
+            'B' => NumberFormat::FORMAT_DATE_YYYYMMDD,
+        ];
+    }
 }

app/Exports/Sales/Sheets/Invoices.php

@@ -4,8 +4,10 @@ namespace App\Exports\Sales\Sheets;
 
 use App\Abstracts\Export;
 use App\Models\Sale\Invoice as Model;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
-class Invoices extends Export
+class Invoices extends Export implements WithColumnFormatting
 {
     public function collection()
     {
@@ -46,4 +48,12 @@ class Invoices extends Export
             'footer',
         ];
     }
+
+    public function columnFormats(): array
+    {
+        return [
+            'D' => NumberFormat::FORMAT_DATE_YYYYMMDD,
+            'E' => NumberFormat::FORMAT_DATE_YYYYMMDD,
+        ];
+    }
 }

app/Traits/Permissions.php

@@ -6,6 +6,7 @@ use App\Models\Auth\Permission;
 use App\Models\Auth\Role;
 use App\Utilities\Reports;
 use App\Utilities\Widgets;
+use Illuminate\Routing\Route;
 use Illuminate\Support\Str;
 
 trait Permissions
@@ -387,4 +388,58 @@ trait Permissions
 
         return $this->getRoles('read-client-portal');
     }
+
+    /**
+     * Assign permissions middleware to default controller methods.
+     *
+     * @return void
+     */
+    public function assignPermissionsToController()
+    {
+        // No need to check for permission in console
+        if (app()->runningInConsole()) {
+            return;
+        }
+
+        $route = app(Route::class);
+
+        // Get the controller array
+        $arr = array_reverse(explode('\\', explode('@', $route->getActionName())[0]));
+
+        $controller = '';
+
+        // Add module
+        if (isset($arr[3]) && isset($arr[4])) {
+            if (strtolower($arr[4]) == 'modules') {
+                $controller .= Str::kebab($arr[3]) . '-';
+            } elseif (isset($arr[5]) && (strtolower($arr[5]) == 'modules')) {
+                $controller .= Str::kebab($arr[4]) . '-';
+            }
+        }
+
+        // Add folder
+        if (strtolower($arr[1]) != 'controllers') {
+            $controller .= Str::kebab($arr[1]) . '-';
+        }
+
+        // Add file
+        $controller .= Str::kebab($arr[0]);
+
+        // Skip ACL
+        $skip = ['portal-dashboard'];
+        if (in_array($controller, $skip)) {
+            return;
+        }
+
+        // App\Http\Controllers\FooBar                  -->> foo-bar
+        // App\Http\Controllers\FooBar\Main             -->> foo-bar-main
+        // Modules\Blog\Http\Controllers\Posts          -->> blog-posts
+        // Modules\Blog\Http\Controllers\Portal\Posts   -->> blog-portal-posts
+
+        // Add CRUD permission check
+        $this->middleware('permission:create-' . $controller)->only('create', 'store', 'duplicate', 'import');
+        $this->middleware('permission:read-' . $controller)->only('index', 'show', 'edit', 'export');
+        $this->middleware('permission:update-' . $controller)->only('update', 'enable', 'disable');
+        $this->middleware('permission:delete-' . $controller)->only('destroy');
+    }
 }

database/factories/Bill.php

@@ -13,6 +13,7 @@ use App\Models\Common\Item;
 use App\Models\Purchase\Bill as Model;
 use App\Models\Setting\Tax;
 use App\Utilities\Date;
+use App\Utilities\Overrider;
 
 class Bill extends Factory
 {
@@ -190,6 +191,8 @@ class Bill extends Factory
     public function configure()
     {
         return $this->afterCreating(function (Model $bill) {
+            Overrider::load('currencies');
+
             $init_status = $bill->status;
 
             $bill->status = 'draft';

database/factories/Invoice.php

@@ -14,6 +14,7 @@ use App\Models\Common\Item;
 use App\Models\Sale\Invoice as Model;
 use App\Models\Setting\Tax;
 use App\Utilities\Date;
+use App\Utilities\Overrider;
 
 class Invoice extends Factory
 {
@@ -203,6 +204,8 @@ class Invoice extends Factory
     public function configure()
     {
         return $this->afterCreating(function (Model $invoice) {
+            Overrider::load('currencies');
+
             $init_status = $invoice->status;
 
             $invoice->status = 'draft';