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

This commit is contained in:
yogesh_gohil
2019-11-20 15:16:19 +05:30
9 changed files with 30 additions and 32 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{ {
"/assets/js/app.js": "/assets/js/app.js?id=163d38f203813d39876c", "/assets/js/app.js": "/assets/js/app.js?id=0de16e5183b0d24fd95d",
"/assets/css/crater.css": "/assets/css/crater.css?id=cfbb5bcff9172ae150e6" "/assets/css/crater.css": "/assets/css/crater.css?id=361d275866b6299acb36"
} }

View File

@ -10,8 +10,9 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
1. [Documentation](#documentation) 1. [Documentation](#documentation)
2. [Download](#download) 2. [Download](#download)
5. [Mobile Apps](#mobile-apps) 3. [Mobile Apps](#mobile-apps)
5. [Roadmap](#roadmap) 4. [Roadmap](#roadmap)
5. [Credits](#credits)
6. [License](#license) 6. [License](#license)
## Documentation ## Documentation
@ -27,7 +28,7 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
## Mobile Apps ## Mobile Apps
- [Android](https://play.google.com/store/apps/details?id=com.craterapp.app) - [Android](https://play.google.com/store/apps/details?id=com.craterapp.app)
- IOS - Coming Soon - IOS - Coming Soon
- [Source](https://github.com/bytefuryco/crater-mobile) - [Source](https://github.com/bytefury/crater-mobile)
## Roadmap ## Roadmap
@ -37,6 +38,7 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
- [x] Installation Wizard - [x] Installation Wizard
- [ ] Available as a docker image - [ ] Available as a docker image
- [ ] Performance Improvements - [ ] Performance Improvements
- [ ] Customer View page
- [ ] Customer Portal - [ ] Customer Portal
- [ ] Accept Payments (Stripe Integration) - [ ] Accept Payments (Stripe Integration)
- [ ] Add and Use Custom Fields on Invoices & Estimates. - [ ] Add and Use Custom Fields on Invoices & Estimates.
@ -44,6 +46,10 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
- [ ] White Labeling (Easy Invoice, Email & Consumer Portal Theme customisation) - [ ] White Labeling (Easy Invoice, Email & Consumer Portal Theme customisation)
- [ ] Vendors, Inventory & Bills - [ ] Vendors, Inventory & Bills
## Credits
Crater is a product of [Bytefury](https://bytefury.com)
## License ## License
Crater is released under the Attribution Assurance License. Crater is released under the Attribution Assurance License.
See [LICENSE](LICENSE) for details. See [LICENSE](LICENSE) for details.