Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6477 from turbo124/v5-develop

Browse Source 
Adjust updated_at for /refresh routes for is_large accounts
This commit is contained in:
David Bomba 2021-08-17 20:49:57 +10:00 committed by GitHub
commit 225236dfa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Helpers/Invoice/InvoiceItemSum.php
View File

@ -81,8 +81,6 @@ class InvoiceItemSum
private function push() private function push()
{ {
nlog($this->sub_total . " + ". $this->getLineTotal());
$this->sub_total += $this->getLineTotal(); $this->sub_total += $this->getLineTotal();
$this->line_items[] = $this->item; $this->line_items[] = $this->item;
@ -125,9 +123,6 @@ class InvoiceItemSum
{ {
$item_tax = 0; $item_tax = 0;
// nlog(print_r($this->item,1));
// nlog(print_r($this->invoice,1));
$amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / 100)); $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / 100));
$item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount); $item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount);

4
app/Http/Controllers/BaseController.php
View File

@ -202,6 +202,10 @@ class BaseController extends Controller
$transformer = new $this->entity_transformer($this->serializer); $transformer = new $this->entity_transformer($this->serializer);
$updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0; $updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0;
if ($user->getCompany()->is_large && $updated_at == 0){
$updated_at = time();
}
$updated_at = date('Y-m-d H:i:s', $updated_at); $updated_at = date('Y-m-d H:i:s', $updated_at);
$query->with( $query->with(