validation and status changes

app/Http/Controllers/InvoicesController.php

@@ -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;
         }
 

app/Http/Controllers/PaymentController.php

@@ -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->getPreviousStatus();
-                $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->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->getPreviousStatus();
-                    $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->save();
             }
 

app/Http/Requests/CustomerRequest.php

@@ -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:

app/Http/Requests/EstimatesRequest.php

@@ -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.*.quantity' => 'required|digits_between:1,20',
-            'items.*.price' => 'required|numeric',
+            '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') {

app/Http/Requests/ExpenseRequest.php

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

app/Http/Requests/InvoicesRequest.php

@@ -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.*.quantity' => 'required|digits_between:1,20',
-            'items.*.price' => 'required|numeric',
+            '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') {

app/Http/Requests/ItemsRequest.php

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

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',
+            'amount' => 'required|digits_between:1,20',
         ];
 
         if ($this->getMethod() == 'PUT') {

app/Http/Requests/ProfileRequest.php

@@ -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;

database/migrations/2017_04_11_081227_create_items_table.php

@@ -18,7 +18,7 @@ class CreateItemsTable extends Migration
             $table->string('name');
             $table->string('description')->nullable();
             $table->string('unit')->nullable();
-            $table->integer('price');
+            $table->unsignedBigInteger('price');
             $table->integer('company_id')->unsigned()->nullable();
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
             $table->timestamps();

database/migrations/2017_04_12_090759_create_invoices_table.php

@@ -24,13 +24,13 @@ class CreateInvoicesTable extends Migration
             $table->string('tax_per_item');
             $table->string('discount_per_item');
             $table->text('notes')->nullable();
-            $table->decimal('discount', 15, 0)->nullable();
             $table->string('discount_type')->nullable();
-            $table->integer('discount_val')->nullable();
+            $table->unsignedBigInteger('discount')->nullable();
-            $table->integer('sub_total');
+            $table->unsignedBigInteger('discount_val')->nullable();
-            $table->integer('total');
+            $table->unsignedBigInteger('sub_total');
-            $table->integer('tax');
+            $table->unsignedBigInteger('total');
-            $table->integer('due_amount');
+            $table->unsignedBigInteger('tax');
+            $table->unsignedBigInteger('due_amount');
             $table->boolean('sent')->default(false);
             $table->boolean('viewed')->default(false);
             $table->string('unique_hash')->nullable();

database/migrations/2017_04_12_091015_create_invoice_items_table.php

@@ -17,13 +17,13 @@ class CreateInvoiceItemsTable extends Migration
             $table->increments('id');
             $table->string('name');
             $table->string('description')->nullable();
-            $table->integer('quantity');
-            $table->integer('price');
             $table->string('discount_type');
-            $table->integer('discount_val');
+            $table->unsignedBigInteger('quantity');
-            $table->decimal('discount', 15, 0);
+            $table->unsignedBigInteger('price');
-            $table->integer('tax');
+            $table->unsignedBigInteger('discount_val');
-            $table->integer('total');
+            $table->unsignedBigInteger('discount');
+            $table->unsignedBigInteger('tax');
+            $table->unsignedBigInteger('total');
             $table->integer('invoice_id')->unsigned();
             $table->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
             $table->integer('item_id')->unsigned()->nullable();

database/migrations/2017_05_05_055609_create_estimates_table.php

@@ -23,12 +23,12 @@ class CreateEstimatesTable extends Migration
             $table->string('tax_per_item');
             $table->string('discount_per_item');
             $table->string('notes')->nullable();
-            $table->decimal('discount', 15, 0)->nullable();
             $table->string('discount_type')->nullable();
-            $table->integer('discount_val')->nullable();
+            $table->unsignedBigInteger('discount')->nullable();
-            $table->integer('sub_total');
+            $table->unsignedBigInteger('discount_val')->nullable();
-            $table->integer('total');
+            $table->unsignedBigInteger('sub_total');
-            $table->integer('tax');
+            $table->unsignedBigInteger('total');
+            $table->unsignedBigInteger('tax');
             $table->string('unique_hash')->nullable();
             $table->integer('user_id')->unsigned()->nullable();
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');

database/migrations/2017_10_02_123501_create_estimate_items_table.php

@@ -17,13 +17,13 @@ class CreateEstimateItemsTable extends Migration
             $table->increments('id');
             $table->string('name');
             $table->string('description')->nullable();
-            $table->integer('quantity');
             $table->string('discount_type');
-            $table->decimal('discount', 15, 0);
+            $table->unsignedBigInteger('quantity');
-            $table->integer('discount_val');
+            $table->unsignedBigInteger('discount');
-            $table->integer('price');
+            $table->unsignedBigInteger('discount_val');
-            $table->integer('tax');
+            $table->unsignedBigInteger('price');
-            $table->integer('total');
+            $table->unsignedBigInteger('tax');
+            $table->unsignedBigInteger('total');
             $table->integer('item_id')->unsigned()->nullable();
             $table->foreign('item_id')->references('id')->on('items')->onDelete('cascade');
             $table->integer('estimate_id')->unsigned();

database/migrations/2018_11_02_133956_create_expenses_table.php

@@ -17,7 +17,7 @@ class CreateExpensesTable extends Migration
             $table->increments('id');
             $table->date('expense_date');
             $table->string('attachment_receipt')->nullable();
-            $table->integer('amount');
+            $table->unsignedBigInteger('amount');
             $table->string('notes')->nullable();
             $table->integer('expense_category_id')->unsigned();
             $table->foreign('expense_category_id')->references('id')->on('expense_categories')->onDelete('cascade');

database/migrations/2019_09_03_135234_create_payments_table.php

@@ -19,7 +19,7 @@ class CreatePaymentsTable extends Migration
             $table->string('payment_mode')->nullable();
             $table->date('payment_date');
             $table->text('notes')->nullable();
-            $table->decimal('amount', 15, 0);
+            $table->unsignedBigInteger('amount');
             $table->integer('user_id')->unsigned();
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $table->integer('invoice_id')->unsigned()->nullable();

database/migrations/2019_09_21_052548_create_taxes_table.php

@@ -30,7 +30,7 @@ class CreateTaxesTable extends Migration
             $table->integer('company_id')->unsigned()->nullable();
             $table->foreign('company_id')->references('id')->on('companies');
             $table->string('name');
-            $table->decimal('amount', 15, 0);
+            $table->unsignedBigInteger('amount');
             $table->decimal('percent', 5, 2);
             $table->tinyInteger('compound_tax')->default(0);
             $table->timestamps();

database/seeds/EstimateTemplateSeeder.php

@@ -13,19 +13,19 @@ class EstimateTemplateSeeder extends Seeder
     public function run()
     {
         EstimateTemplate::create([
-            'name' => 'Estimate Template1',
+            'name' => 'Template 1',
             'view' => 'estimate1',
             'path' => '/assets/img/PDF/Template1.png'
         ]);
 
         EstimateTemplate::create([
-            'name' => 'Estimate Template2',
+            'name' => 'Template 2',
             'view' => 'estimate2',
             'path' => '/assets/img/PDF/Template2.png'
         ]);
 
         EstimateTemplate::create([
-            'name' => 'Estimate Template3',
+            'name' => 'Template 3',
             'view' => 'estimate3',
             'path' => '/assets/img/PDF/Template3.png'
         ]);

database/seeds/InvoiceTemplateSeeder.php

@@ -13,19 +13,19 @@ class InvoiceTemplateSeeder extends Seeder
     public function run()
     {
         InvoiceTemplate::create([
-            'name' => 'Invoice Template1',
+            'name' => 'Template 1',
             'view' => 'invoice1',
             'path' => '/assets/img/PDF/Template1.png'
         ]);
 
         InvoiceTemplate::create([
-            'name' => 'Invoice Template2',
+            'name' => ' Template 2',
             'view' => 'invoice2',
             'path' => '/assets/img/PDF/Template2.png'
         ]);
 
         InvoiceTemplate::create([
-            'name' => 'Invoice Template3',
+            'name' => 'Template 3',
             'view' => 'invoice3',
             'path' => '/assets/img/PDF/Template3.png'
         ]);