Merge Invoice and Bill into Document

neslonso · Dec 23, 2020 · 0c1424d · 0c1424d
1 parent 830cc05
commit 0c1424d
Show file tree

Hide file tree

Showing 436 changed files with 31,660 additions and 37,355 deletions.
diff --git a/.gitignore b/.gitignore
@@ -95,4 +95,5 @@ _ide_helper_models.php
 modules/*
 !modules/OfflinePayments
 !modules/PaypalStandard
+!modules/BC21
 .laravelstatsrc
diff --git a/app/Abstracts/DocumentModel.php b/app/Abstracts/DocumentModel.php
diff --git a/app/Abstracts/Export.php b/app/Abstracts/Export.php
@@ -15,9 +15,15 @@ abstract class Export implements FromCollection, ShouldAutoSize, WithHeadings, W
 {
     public $ids;
 
-    public function __construct($ids = null)
+    /**
+     * @var string
+     */
+    protected $type;
+
+    public function __construct($ids = null, string $type = '')
     {
         $this->ids = $ids;
+        $this->type = $type;
     }
 
     public function title(): string

diff --git a/app/Abstracts/Factory.php b/app/Abstracts/Factory.php
@@ -3,13 +3,25 @@
 namespace App\Abstracts;
 
 use App\Models\Auth\User;
+use App\Models\Common\Company;
 use App\Traits\Jobs;
 use Illuminate\Database\Eloquent\Factories\Factory as BaseFactory;
+use Illuminate\Database\Eloquent\Model as EloquentModel;
 
 abstract class Factory extends BaseFactory
 {
     use Jobs;
 
+    /**
+     * @var Company
+     */
+    protected $company;
+
+    /**
+     * @var User|EloquentModel|object|null
+     */
+    protected $user;
+
     public function __construct(...$arguments)
     {
         parent::__construct(...$arguments);

diff --git a/app/Abstracts/Http/PaymentController.php b/app/Abstracts/Http/PaymentController.php
@@ -2,9 +2,9 @@
 
 namespace App\Abstracts\Http;
 
-use App\Events\Sale\PaymentReceived;
+use App\Events\Document\PaymentReceived;
 use App\Http\Requests\Portal\InvoicePayment as PaymentRequest;
-use App\Models\Sale\Invoice;
+use App\Models\Document\Document;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Support\Facades\URL;
 use Monolog\Logger;
@@ -41,15 +41,15 @@ public function __construct()
         });
     }
 
-    public function show(Invoice $invoice, PaymentRequest $request)
+    public function show(Document $document, PaymentRequest $request)
     {
-        $this->setContactFirstLastName($invoice);
+        $this->setContactFirstLastName($document);
 
-        $confirm_url = $this->getConfirmUrl($invoice);
+        $confirm_url = $this->getConfirmUrl($document);
 
         $html = view('partials.portal.payment_method.' . $this->type, [
             'setting' => $this->setting,
-            'invoice' => $invoice,
+            'invoice' => $document,
             'confirm_url' => $confirm_url,
         ])->render();
 
@@ -62,12 +62,12 @@ public function show(Invoice $invoice, PaymentRequest $request)
         ]);
     }
 
-    public function signed(Invoice $invoice, PaymentRequest $request)
+    public function signed(Document $document, PaymentRequest $request)
     {
-        return $this->show($invoice, $request);
+        return $this->show($document, $request);
     }
 
-    public function cancel(Invoice $invoice, $force_redirect = false)
+    public function cancel(Document $invoice, $force_redirect = false)
     {
         $message = trans('messages.warning.payment_cancel', ['method' => setting($this->alias . '.name')]);
 

diff --git a/app/Abstracts/Import.php b/app/Abstracts/Import.php
@@ -25,6 +25,16 @@ abstract class Import implements ToModel, SkipsOnError, SkipsOnFailure, WithBatc
 
     public $empty_field = 'empty---';
 
+    /**
+     * @var string
+     */
+    protected $type;
+
+    public function __construct(string $type = '')
+    {
+        $this->type = $type;
+    }
+
     public function map($row): array
     {
         $row['company_id'] = session('company_id');

diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php
@@ -22,6 +22,11 @@ abstract class Model extends Eloquent
         'enabled' => 'boolean',
     ];
 
+    public static function observe($classes)
+    {
+        parent::observe($classes);
+    }
+
     /**
      * The "booting" method of the model.
      *

diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php
@@ -12,7 +12,7 @@
 use App\Exports\Common\Reports as Export;
 use App\Models\Banking\Transaction;
 use App\Models\Common\Report as Model;
-use App\Models\Sale\Invoice;
+use App\Models\Document\Document;
 use App\Traits\Charts;
 use App\Traits\DateTime;
 use App\Utilities\Chartjs;
@@ -355,7 +355,7 @@ public function setTotals($items, $date_field, $check_type = false, $table = 'de
 
             $amount = $item->getAmountConvertedToDefault(false, $with_tax);
 
-            $type = (($item instanceof Invoice) || (($item instanceof Transaction) && ($item->type == 'income'))) ? 'income' : 'expense';
+            $type = ($item->type === Document::INVOICE_TYPE || $item->type === 'income') ? 'income' : 'expense';
 
             if (($check_type == false) || ($type == 'income')) {
                 $this->row_values[$table][$item->$id_field][$date] += $amount;

diff --git a/app/Abstracts/View/Components/DocumentForm.php b/app/Abstracts/View/Components/DocumentForm.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Abstracts\View\Components;
+
+use Illuminate\View\Component;
+use Illuminate\Support\Str;
+
+abstract class DocumentForm extends Component
+{
+    public $type;
+
+    public $documents;
+
+    public $bulkActions;
+
+    /** @var bool */
+    public $hideBulkAction;
+
+    /**
+     * Create a new component instance.
+     *
+     * @return void
+     */
+    public function __construct(
+        $type, $documents = [], $bulkActions = [],
+        bool $hideBulkAction = false
+    ) {
+        $this->type = $type;
+        $this->documents = $documents;
+
+        $this->bulkActions = $bulkActions;
+        $this->hideBulkAction = $hideBulkAction;
+    }
+}