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

app/Http/Requests/EstimatesRequest.php

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

app/Http/Requests/ExpenseRequest.php

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

app/Http/Requests/InvoicesRequest.php

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

app/Http/Requests/ItemsRequest.php

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

app/Http/Requests/PaymentRequest.php

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

public/mix-manifest.json

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

readme.md

@@ -10,8 +10,9 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
 
 1. [Documentation](#documentation)
 2. [Download](#download)
-5. [Mobile Apps](#mobile-apps)
-5. [Roadmap](#roadmap)
+3. [Mobile Apps](#mobile-apps)
+4. [Roadmap](#roadmap)
+5. [Credits](#credits)
 6. [License](#license)
 
 ## Documentation
@@ -27,7 +28,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
-- [Source](https://github.com/bytefuryco/crater-mobile)
+- [Source](https://github.com/bytefury/crater-mobile)
 
 ## Roadmap
 
@@ -37,6 +38,7 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
 -   [x] Installation Wizard
 -   [ ] Available as a docker image
 -   [ ] Performance Improvements
+-   [ ] Customer View page
 -   [ ] Customer Portal
 -   [ ] Accept Payments (Stripe Integration)
 -   [ ] 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)
 -   [ ] Vendors, Inventory & Bills
 
+
+## Credits
+Crater is a product of [Bytefury](https://bytefury.com)
+
 ## License
 Crater is released under the Attribution Assurance License.
 See [LICENSE](LICENSE) for details.