From fb70812aeb00b406d0a4617e508604d78a360963 Mon Sep 17 00:00:00 2001
From: Edmond Teh <edmondtm@gmail.com>
Date: Mon, 7 Sep 2020 03:12:49 +0800
Subject: [PATCH] add reg_no

---
 app/Http/Controllers/InvoiceController.php    | 12 ++++---
 ...20_09_07_024530_add_reg_no_to_invoices.php | 32 +++++++++++++++++++
 resources/assets/js/components/NewInvoice.vue | 20 ++++++++++++
 resources/views/myPDF.blade.php               | 15 ---------
 resources/views/pdf/po.blade.php              |  2 +-
 5 files changed, 61 insertions(+), 20 deletions(-)
 create mode 100644 database/migrations/2020_09_07_024530_add_reg_no_to_invoices.php
 delete mode 100644 resources/views/myPDF.blade.php

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index fe7da199..ba836ebc 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -49,6 +49,7 @@ class InvoiceController extends Controller
             'buyer_company' => 'required',
             'contact_no' => 'required',
             'marking' => 'required',
+            'reg_no' => 'required',
             'lines.*.order' => 'required|numeric',
             'lines.*.stock_code' => 'required',
             'lines.*.description' => 'required',
@@ -99,6 +100,7 @@ class InvoiceController extends Controller
         $invoice = new Invoice;
         $invoice->amount = $total;
         $invoice->booking_id = (int)$id;
+        $invoice->reg_no = $validatedData['reg_no'];
         $invoice->buyer_company = $validatedData['buyer_company'];
         $invoice->address = $validatedData['address'];
         $invoice->contact_no = $validatedData['contact_no'];
@@ -153,6 +155,7 @@ class InvoiceController extends Controller
             'buyer_company' => 'required',
             'contact_no' => 'required',
             'marking' => 'required',
+            'reg_no' => 'required',
             'lines.*.order' => 'required|numeric',
             'lines.*.stock_code' => 'required',
             'lines.*.description' => 'required',
@@ -207,6 +210,7 @@ class InvoiceController extends Controller
 
         $invoice->amount = $total;
         $invoice->booking_id = (int)$id;
+        $invoice->reg_no = $validatedData['reg_no'];
         $invoice->buyer_company = $validatedData['buyer_company'];
         $invoice->address = $validatedData['address'];
         $invoice->contact_no = $validatedData['contact_no'];
@@ -320,7 +324,7 @@ class InvoiceController extends Controller
             'title' => 'Purchase Order',
             'buyer' => [
                 'buyer_company' => $invoice->buyer_company,
-                'reg_no' => '',
+                'reg_no' => $invoice->reg_no,
                 'address' => $invoice->address,
                 'gst' => '',
                 'phone' => $invoice->contact_no
@@ -370,7 +374,7 @@ class InvoiceController extends Controller
             'title' => 'Delivery Order',
             'buyer' => [
                 'buyer_company' => $invoice->buyer_company,
-                'reg_no' => '',
+                'reg_no' => $invoice->reg_no,
                 'address' => $invoice->address,
                 'gst' => '',
                 'phone' => $invoice->contact_no
@@ -418,8 +422,8 @@ class InvoiceController extends Controller
                  'phone' => '018 2909252'
              ],
              'seller' => [
-                 'seller_company' => $invoice->buyer_company,
-                 'address' => $supplier->company_name,
+                 'seller_company' => $supplier->company_name,
+                 'address' => '',
                  'phone' => '',
                  'date' => '',
                  'po_number' => $invoice->po_number,
diff --git a/database/migrations/2020_09_07_024530_add_reg_no_to_invoices.php b/database/migrations/2020_09_07_024530_add_reg_no_to_invoices.php
new file mode 100644
index 00000000..5dddf6c7
--- /dev/null
+++ b/database/migrations/2020_09_07_024530_add_reg_no_to_invoices.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddRegNoToInvoices extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            $table->string('reg_no');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/resources/assets/js/components/NewInvoice.vue b/resources/assets/js/components/NewInvoice.vue
index 4608c127..e54d97a4 100644
--- a/resources/assets/js/components/NewInvoice.vue
+++ b/resources/assets/js/components/NewInvoice.vue
@@ -68,6 +68,21 @@
                 Contact Number Required
               </div>
             </div>
+            <div class="form-group">
+              <label for="reg-no">Company Registration Number</label>
+              <input id="reg-no"
+                     v-model.trim="$v.form.formData.reg_no.$model"
+                     :class="{
+                       'is-invalid': $v.form.formData.reg_no.$invalid && $v.form.formData.reg_no.$dirty,
+                       'is-valid': !$v.form.formData.reg_no.$invalid && $v.form.formData.reg_no.$dirty
+                     }"
+                     :disabled="!editable"
+                     type="text" class="form-control"
+                     @blur="$v.form.formData.reg_no.$touch()">
+              <div class="invalid-feedback">
+                Company Registration Number Required
+              </div>
+            </div>
             <div class="form-group">
               <label for="address">Address</label>
               <textarea id="address"
@@ -476,6 +491,7 @@ export default {
           contact_no: '',
           marking: this.booking_details.marking,
           gst_id: '',
+          reg_no: '',
           lines: []
         },
         addLine: {
@@ -525,6 +541,9 @@ export default {
         marking: {
           required
         },
+        reg_no: {
+          required
+        },
         gst_id: {
 
         }
@@ -708,6 +727,7 @@ export default {
           this.form.formData.buyer_company = resp.data.buyer_company
           this.form.formData.contact_no = resp.data.contact_no
           this.form.formData.address = resp.data.address
+          this.form.formData.reg_no = resp.data.reg_no
 
           this.form.formData.lines = []
           this.statuses = []
diff --git a/resources/views/myPDF.blade.php b/resources/views/myPDF.blade.php
deleted file mode 100644
index 1897818c..00000000
--- a/resources/views/myPDF.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>Hi</title>
-</head>
-<body>
-	<h1>Welcome to ItSolutionStuff.com - {{ $title }}</h1>
-	<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-	tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-	quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-	consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-	cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-	proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/resources/views/pdf/po.blade.php b/resources/views/pdf/po.blade.php
index 08f1b6e2..9a05b4c6 100644
--- a/resources/views/pdf/po.blade.php
+++ b/resources/views/pdf/po.blade.php
@@ -81,7 +81,7 @@
                 {{ $buyer['buyer_company'] }}
             </span>
             <span class="reg">
-                X-123456
+                {{ $buyer['reg_no'] }}
             </span>
             <span class="address">
                 {{ $buyer['address'] }}