Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Merge pull request #7475 from turbo124/v5-develop

Browse Source 
Prep for react application
This commit is contained in:
David Bomba 2022-05-27 12:06:38 +10:00 committed by GitHub
commit a17c97a5ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/release.yml vendored
View File

@ -39,6 +39,18 @@ jobs:
sudo find ./vendor/bin/ -type f -exec chmod +x {} \;
sudo find ./ -type d -exec chmod 755 {} \;
- name: Prepare React FrontEnd
run: |
mkdir public/react
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

2
app/Http/Controllers/InvoiceController.php
View File

@ -220,8 +220,6 @@ class InvoiceController extends BaseController
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()

2
app/Http/ValidationRules/Payment/ValidInvoicesRules.php
View File

@ -62,7 +62,7 @@ class ValidInvoicesRules implements Rule
return false;
}
$inv = Invoice::whereId($invoice['invoice_id'])->first();
$inv = Invoice::withTrashed()->whereId($invoice['invoice_id'])->first();
if (! $inv) {

7
app/Services/Invoice/HandleCancellation.php
View File

@ -51,6 +51,7 @@ class HandleCancellation extends AbstractService
//adjust client balance
$this->invoice->client->service()->updateBalance($adjustment)->save();
$this->invoice->fresh();
$this->invoice->service()->workFlow()->save();
@ -78,7 +79,8 @@ class HandleCancellation extends AbstractService
$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 @@ class HandleCancellation extends AbstractService
unset($backup->cancellation);
$this->invoice->backup = $backup;
$this->invoice->saveQuietly();
$this->invoice->fresh();
return $this->invoice;
}