TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into build-version210

Browse Source
This commit is contained in:
raishvaria
2019-12-14 13:55:26 +05:30
parent c88eb24265 d926073095
commit 9271ceba45
6 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ class EstimatesRequest extends FormRequest
$rules = [
'estimate_date' => 'required',
'expiry_date' => 'required',
'estimate_number' => 'required|unique:estimates,estimate_number',
'user_id' => 'required',
'discount' => 'required',
'discount_val' => 'required',
@ -41,10 +40,6 @@ class EstimatesRequest extends FormRequest
'items.*.price' => 'required'
];
if ($this->getMethod() == 'PUT') {
$rules['estimate_number'] = $rules['estimate_number'].','.$this->get('id');
}
return $rules;
}
}

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

@ -25,7 +25,6 @@ class InvoicesRequest extends FormRequest
$rules = [
'invoice_date' => 'required',
'due_date' => 'required',
'invoice_number' => 'required|unique:invoices,invoice_number',
'user_id' => 'required',
'discount' => 'required',
'discount_val' => 'required',
@ -41,10 +40,6 @@ class InvoicesRequest extends FormRequest
'items.*.price' => 'required'
];
if ($this->getMethod() == 'PUT') {
$rules['invoice_number'] = $rules['invoice_number'].','.$this->get('id');
}
return $rules;
}
}

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

@ -24,15 +24,10 @@ class PaymentRequest extends FormRequest
{
$rules = [
'payment_date' => 'required',
'payment_number' => 'required|unique:payments,payment_number',
'user_id' => 'required',
'amount' => 'required',
];
if ($this->getMethod() == 'PUT') {
$rules['payment_number'] = $rules['payment_number'].','.$this->route('payment');
}
return $rules;
}
}

1
app/Listeners/Updates/v2/Version200.php
View File

@ -6,7 +6,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Database\Schema\Blueprint;
use Crater\Listeners\Updates\Listener;
use Crater\Listeners\Updates\v2\Version200;
use Crater\Events\UpdateFinished;
use Crater\Setting;
use Crater\Address;

6
database/migrations/2019_09_14_120124_create_media_table.php
View File

@ -20,9 +20,9 @@ class CreateMediaTable extends Migration
$table->string('mime_type')->nullable();
$table->string('disk');
$table->unsignedInteger('size');
$table->json('manipulations');
$table->json('custom_properties');
$table->json('responsive_images');
$table->text('manipulations');
$table->text('custom_properties');
$table->text('responsive_images');
$table->unsignedInteger('order_column')->nullable();
$table->nullableTimestamps();
});

2
readme.md
View File

@ -29,7 +29,7 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
## Mobile Apps
- [Android](https://play.google.com/store/apps/details?id=com.craterapp.app)
- IOS - Coming Soon
- [IOS](https://apps.apple.com/app/id1489169767)
- [Source](https://github.com/bytefury/crater-mobile)
## Discord