mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git
synced 2026-08-19 04:14:04 +00:00
add reg_no
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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) {
|
||||
//
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -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 = []
|
||||
|
||||
@@ -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>
|
||||
@@ -81,7 +81,7 @@
|
||||
{{ $buyer['buyer_company'] }}
|
||||
</span>
|
||||
<span class="reg">
|
||||
X-123456
|
||||
{{ $buyer['reg_no'] }}
|
||||
</span>
|
||||
<span class="address">
|
||||
{{ $buyer['address'] }}
|
||||
|
||||
Reference in New Issue
Block a user