\Merge branch 'v5-develop' into v5-stable

turbo124 · May 27, 2022 · 373cac1 · 373cac1
2 parents 6dc9a4c + 418c7c2
commit 373cac1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,6 +39,17 @@ jobs:
           sudo find ./vendor/bin/ -type f -exec chmod +x {} \;
           sudo find ./ -type d -exec chmod 755 {} \;
           
+      - name: Prepare React FrontEnd
+        run: |
+          git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/ui.git
+          cd ui
+          git checkout main
+          npm i
+          npm run build
+          cp -r dist/react/* ../public/react
+          cd ..
+          rm -rf ui
+
       - name: Prepare JS/CSS assets
         run: |
           npm i

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
@@ -220,8 +220,6 @@ public function create(CreateInvoiceRequest $request)
     public function store(StoreInvoiceRequest $request)
     {
 
-        // $client = Client::find($request->input('client_id'));
-
         $invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
         $invoice = $invoice->service()

diff --git a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
@@ -62,7 +62,7 @@ private function checkInvoicesAreHomogenous()
                 return false;
             }
 
-            $inv = Invoice::whereId($invoice['invoice_id'])->first();
+            $inv = Invoice::withTrashed()->whereId($invoice['invoice_id'])->first();
 
             if (! $inv) {
 

diff --git a/app/Services/Invoice/HandleCancellation.php b/app/Services/Invoice/HandleCancellation.php
@@ -51,6 +51,7 @@ public function run()
 
         //adjust client balance
         $this->invoice->client->service()->updateBalance($adjustment)->save();
+        $this->invoice->fresh();
 
         $this->invoice->service()->workFlow()->save();
 
@@ -78,7 +79,8 @@ public function reverse()
         $adjustment = $cancellation->adjustment * -1;
 
         $this->invoice->ledger()->updateInvoiceBalance($adjustment, "Invoice {$this->invoice->number} reversal");
-
+        $this->invoice->fresh();
+
         /* Reverse the invoice status and balance */
         $this->invoice->balance += $adjustment;
         $this->invoice->status_id = $cancellation->status_id;
@@ -90,7 +92,8 @@ public function reverse()
         unset($backup->cancellation);
         $this->invoice->backup = $backup;
         $this->invoice->saveQuietly();
-
+        $this->invoice->fresh();
+
         return $this->invoice;
     }