diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index d8c29fb2..f20e6914 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -36,7 +36,7 @@ class InvoiceController extends Controller } - public function getSupplierPO($id) + public function getSupplierDO($id) { } diff --git a/database/migrations/2020_08_24_161747_add_fields_to_invoice.php b/database/migrations/2020_08_24_161747_add_fields_to_invoice.php new file mode 100644 index 00000000..df44829e --- /dev/null +++ b/database/migrations/2020_08_24_161747_add_fields_to_invoice.php @@ -0,0 +1,39 @@ +string('buyer_company', 50); + $table->string('reg_no', 100); + $table->string('address', 120); + $table->string('contact_no', 20); + $table->string('po_number', 20); + $table->string('order_no', 20); + $table->double('tax_rate')->default(0); + $table->double('billing_charge_rate'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('invoices', function (Blueprint $table) { + // + }); + } +} diff --git a/database/migrations/2020_08_24_170514_add_invoice_details.php b/database/migrations/2020_08_24_170514_add_invoice_details.php new file mode 100644 index 00000000..02dbb3b2 --- /dev/null +++ b/database/migrations/2020_08_24_170514_add_invoice_details.php @@ -0,0 +1,36 @@ +increments('id'); + $table->integer('order'); + $table->string('description'); + $table->integer('quantity'); + $table->double('unit_price'); + $table->string('stock_code'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('invoice_details'); + } +} diff --git a/database/migrations/2020_08_24_173533_add_foreign_id_to_invoice_details.php b/database/migrations/2020_08_24_173533_add_foreign_id_to_invoice_details.php new file mode 100644 index 00000000..99ab7f1c --- /dev/null +++ b/database/migrations/2020_08_24_173533_add_foreign_id_to_invoice_details.php @@ -0,0 +1,39 @@ +integer('invoice_id')->unsigned(); + + $table->foreign('invoice_id') + ->references('id') + ->on('invoices') + ->onDelete('cascade'); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('invoice_details', function (Blueprint $table) { + // + }); + } +} diff --git a/database/migrations/2020_08_24_181820_create_invoice_status.php b/database/migrations/2020_08_24_181820_create_invoice_status.php new file mode 100644 index 00000000..86ad70f0 --- /dev/null +++ b/database/migrations/2020_08_24_181820_create_invoice_status.php @@ -0,0 +1,38 @@ +increments('id'); + $table->string('status', 20); + $table->string('comment'); + $table->timestamps(); + $table->integer('invoice_id')->unsigned(); + $table->foreign('invoice_id') + ->references('id') + ->on('invoices') + ->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('invoice_statuses'); + } +} diff --git a/routes/api.php b/routes/api.php index 72226b63..ebad7dfe 100644 --- a/routes/api.php +++ b/routes/api.php @@ -137,7 +137,7 @@ Route::group(['middleware' => ['role:admin']], function() { Route::patch('invoice/{id}/status', 'InvoiceController@updateStatus'); Route::get('invoice/{id}/po', 'InvoiceController@getPO'); Route::get('invoice/{id}/do', 'InvoiceController@getDO'); - Route::get('invoice/{id}/supplierpo', 'InvoiceController@supplierPO'); + Route::get('invoice/{id}/supplierdo', 'InvoiceController@supplierDO'); Route::get('admin/complete-orders', 'BookingController@adminShowCompletedOrders'); // for both user and admin