TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-12-15 09:52:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'auto-update' into 'master'

Browse Source 
Auto update

See merge request mohit.panjvani/crater-web!23
This commit is contained in:
Mohit Panjwani
2019-11-14 15:39:05 +00:00
parent c00c4b8ae7 917b618ac7
commit 55bb6ee0a3
33 changed files with 369 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/AccessTokensController.php
View File

@@ -54,7 +54,7 @@ class AccessTokensController extends Controller
{
$request->validate([
'username' => 'required|email',
'password' => 'required|string',
'password' => 'required|string|min:8',
]);
if ($this->hasTooManyLoginAttempts($request)) {

1
app/Http/Controllers/EnvironmentController.php
View File

@@ -37,6 +37,7 @@ class EnvironmentController extends Controller
if(array_key_exists("success", $results)) {
Artisan::call('config:clear');
Artisan::call('key:generate --force');
Artisan::call('migrate --seed');
Artisan::call('migrate', ['--path' => 'vendor/laravel/passport/database/migrations']);

1
app/Http/Controllers/InvoicesController.php
View File

@@ -260,6 +260,7 @@ class InvoicesController extends Controller
'error' => 'invalid_due_amount'
]);
} elseif ($invoice->due_amount != 0 && $invoice->paid_status == Invoice::STATUS_PAID) {
$invoice->status = $invoice->getPreviousStatus();
$invoice->paid_status = Invoice::STATUS_PARTIALLY_PAID;
}

23
app/Http/Controllers/PaymentController.php
View File

@@ -170,6 +170,7 @@ class PaymentController extends Controller
$invoice->status = Invoice::STATUS_COMPLETED;
$invoice->paid_status = Invoice::STATUS_PAID;
} else {
$invoice->status = $invoice->getPreviousStatus();
$invoice->paid_status = Invoice::STATUS_PARTIALLY_PAID;
}
@@ -211,16 +212,7 @@ class PaymentController extends Controller
$invoice->paid_status = Invoice::STATUS_PARTIALLY_PAID;
}
if ($invoice->due_date < Carbon::now()) {
$invoice->status = Invoice::STATUS_OVERDUE;
} elseif ($invoice->viewed) {
$invoice->status = Invoice::STATUS_VIEWED;
} elseif ($invoice->sent) {
$invoice->status = Invoice::STATUS_SENT;
} else {
$invoice->status = Invoice::STATUS_DRAFT;
}
$invoice->status = $invoice->getPreviousStatus();
$invoice->save();
}
@@ -246,16 +238,7 @@ class PaymentController extends Controller
$invoice->paid_status = Invoice::STATUS_PARTIALLY_PAID;
}
if ($invoice->due_date < Carbon::now()) {
$invoice->status = Invoice::STATUS_OVERDUE;
} elseif ($invoice->sent) {
$invoice->status = Invoice::STATUS_SENT;
} elseif ($invoice->viewed) {
$invoice->status = Invoice::STATUS_VIEWED;
} else {
$invoice->status = Invoice::STATUS_DRAFT;
}
$invoice->status = $invoice->getPreviousStatus();
$invoice->save();
}

3
app/Http/Controllers/ReportController.php
View File

@@ -26,8 +26,7 @@ class ReportController extends Controller
$query->whereBetween(
'invoice_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
)
->where('paid_status', Invoice::STATUS_PAID);
);
}])
->customer()
->whereCompany($company->id)

28
app/Http/Controllers/UpdateController.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
namespace Laraspace\Http\Controllers;
use Illuminate\Http\Request;
use Laraspace\Space\Updater;
use Laraspace\Space\SiteApi;
class UpdateController extends Controller
{
public function update(Request $request)
{
set_time_limit(600); // 10 minutes
$json = Updater::update($request->installed, $request->version);
return response()->json($json);
}
public function checkLatestVersion(Request $request)
{
set_time_limit(600); // 10 minutes
$json = Updater::checkForUpdate();
return response()->json($json);
}
}

4
app/Http/Requests/CustomerRequest.php
View File

@@ -26,12 +26,16 @@ class CustomerRequest extends FormRequest
case 'POST':
return [
'name' => 'required',
'addresses.*.address_street_1' => 'max:255',
'addresses.*.address_street_2' => 'max:255',
'email' => 'email|nullable|unique:users,email',
];
break;
case 'PUT':
return [
'name' => 'required',
'addresses.*.address_street_1' => 'max:255',
'addresses.*.address_street_2' => 'max:255',
];
break;
default:

15
app/Http/Requests/EstimatesRequest.php
View File

@@ -27,13 +27,22 @@ class EstimatesRequest extends FormRequest
'expiry_date' => 'required',
'estimate_number' => 'required|unique:estimates,estimate_number',
'user_id' => 'required',
'discount' => 'required',
'discount' => 'required|digits_between:1,20',
'discount_val' => 'required|digits_between:1,20',
'sub_total' => 'required|digits_between:1,20',
'total' => 'required|digits_between:1,20',
'tax' => 'required|digits_between:1,20',
'estimate_template_id' => 'required',
'items' => 'required|array',
'items.*.description' => 'max:255',
'items.*' => 'required|max:255',
'items.*.name' => 'required',
'items.*.quantity' => 'required|numeric',
'items.*.price' => 'required|numeric',
'items.*.quantity' => 'required|digits_between:1,20',
'items.*.price' => 'required|digits_between:1,20',
'items.*.discount' => 'digits_between:1,20',
'items.*.discount_val' => 'digits_between:1,20',
'items.*.tax' => 'digits_between:1,20',
'items.*.total' => 'digits_between:1,20',
];
if ($this->getMethod() == 'PUT') {

2
app/Http/Requests/ExpenseRequest.php
View File

@@ -25,7 +25,7 @@ class ExpenseRequest extends FormRequest
return [
'expense_date' => 'required',
'expense_category_id' => 'required',
'amount' => 'required'
'amount' => 'required|digits_between:1,20'
];
}
}

15
app/Http/Requests/InvoicesRequest.php
View File

@@ -27,13 +27,22 @@ class InvoicesRequest extends FormRequest
'due_date' => 'required',
'invoice_number' => 'required|unique:invoices,invoice_number',
'user_id' => 'required',
'discount' => 'required',
'discount' => 'required|digits_between:1,20',
'discount_val' => 'required|digits_between:1,20',
'sub_total' => 'required|digits_between:1,20',
'total' => 'required|digits_between:1,20',
'tax' => 'required|digits_between:1,20',
'invoice_template_id' => 'required',
'items' => 'required|array',
'items.*' => 'required|max:255',
'items.*.description' => 'max:255',
'items.*.name' => 'required',
'items.*.quantity' => 'required|numeric',
'items.*.price' => 'required|numeric',
'items.*.quantity' => 'required|digits_between:1,20',
'items.*.price' => 'required|digits_between:1,20',
'items.*.discount' => 'digits_between:1,20',
'items.*.discount_val' => 'digits_between:1,20',
'items.*.tax' => 'digits_between:1,20',
'items.*.total' => 'digits_between:1,20',
];
if ($this->getMethod() == 'PUT') {

2
app/Http/Requests/ItemsRequest.php
View File

@@ -24,7 +24,7 @@ class ItemsRequest extends FormRequest
{
return [
'name' => 'required',
'price' => 'required',
'price' => 'required|digits_between:1,20',
];
}
}

2
app/Http/Requests/PaymentRequest.php
View File

@@ -26,7 +26,7 @@ class PaymentRequest extends FormRequest
'payment_date' => 'required',
'payment_number' => 'required|unique:payments,payment_number',
'user_id' => 'required',
'amount' => 'required',
'amount' => 'required|digits_between:1,20',
];
if ($this->getMethod() == 'PUT') {

4
app/Http/Requests/ProfileRequest.php
View File

@@ -31,6 +31,8 @@ class ProfileRequest extends FormRequest
return [
'name' => 'required',
'password' => 'required',
'address_street_1' => 'max:255',
'address_street_2' => 'max:255',
'email' => [
'required',
'email',
@@ -41,6 +43,8 @@ class ProfileRequest extends FormRequest
case 'PUT':
return [
'name' => 'required',
'address_street_1' => 'max:255',
'address_street_2' => 'max:255',
'email' => 'required|email'
];
break;