cief/izyim-api
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git synced 2026-08-19 04:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses

Browse Source
This commit is contained in:
Zain Fauzan Rofie Azizi
2018-06-27 10:00:44 +08:00
parent 4e0eb3528d 5c24c159c6
commit 3adfc6d309
7 changed files with 124 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CompanyController.php
+1 -8
View File
@@ -17,13 +17,12 @@ class CompanyController extends Controller
}
$output= array();
$matchedTerms = Company::where('company_name', 'LIKE','%'. $request->search . '%')->get();
//return response()->json($matchedTerm);
if($matchedTerms)
{
foreach ($matchedTerms as $key => $matchedTerm)
{
array_push($output, ['company_name' => $matchedTerm->company_name, 'tel_no' => $matchedTerm->tel_no,
array_push($output, ['com_id'=> $matchedTerm->id, 'company_name' => $matchedTerm->company_name, 'tel_no' => $matchedTerm->tel_no,
'contact_person'=>$matchedTerm->contact_person ]);
}
@@ -62,14 +61,8 @@ class CompanyController extends Controller
}
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
$company->company_name=$request->input('company_name');
$company->registration_no=$request->input('registration_no');
$company->tax_no=$request->input('tax_no');
app/Http/Controllers/ContactController.php
+7 -34
View File
@@ -5,15 +5,10 @@ namespace App\Http\Controllers;
use App\Contact;
use App\Company;
use Illuminate\Http\Request;
use Auth;
class ContactController extends Controller
{
/**
*
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function index()
{
$contacts = Contact::where('user_id', Auth::user()->id)->where('id', $id)->get();
@@ -26,16 +21,11 @@ class ContactController extends Controller
return response()->json($contacts, 200);
}
/**
* Store a new contact list.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
public function sendRequest(Request $request)
{
$user = Auth::user();
$com_id = $request->input('com_id');
// query to find company asisng to $company
$company = Company::find($com_id);
@@ -48,17 +38,11 @@ class ContactController extends Controller
$contact->com_id = $company->id;
$contact->user_id = $user->id;
$contact->save();
return response()->json($contact, 201);
}
/**
* Approve a new contact list.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function postApprove(Request $request, $id)
public function acceptRequest(Request $request, $id)
{
$contact = Contact::where('com_id', Auth::user()->company())->where('id', $id)->first();
//$contact = Contact::where('id', '=', e($id))->first();
@@ -74,7 +58,7 @@ class ContactController extends Controller
$contact->status=0;
}
else{
return response()->json(["message" => "not allowed"], 400);
}
@@ -83,20 +67,9 @@ class ContactController extends Controller
return response()->json($contact, 201);
}
return response()->json($contact, 400);
// $contact = $request->input('id');
// $contact->status = 1;
// $contact->save();
//return redirect()->back()->with('info','Request has been approved ');
}
}
/**
* Remove the contact list.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
$contact = Contact::where('com_id', Auth::user()->company())->where('id', $id)->first();
database/migrations/2018_06_22_072528_add_foreign_key_to_warehouses_table.php
+2 -2
View File
@@ -14,12 +14,11 @@ class AddForeignKeyToWarehousesTable extends Migration
public function up()
{
Schema::table('warehouses', function (Blueprint $table) {
$table->unsignedInteger('com_id');//FK wrn id
$table->foreign('com_id')
->references('id')->on('warehouses')
->onDelete('cascade');
});
}
@@ -33,6 +32,7 @@ class AddForeignKeyToWarehousesTable extends Migration
{
Schema::table('warehouses', function (Blueprint $table) {
//
});
}
}
database/migrations/2018_06_26_075427_drop_and_add_company_id.php
+33
View File
@@ -0,0 +1,33 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class DropAndAddCompanyId extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('contacts', function (Blueprint $table) {
//
$table->renameColumn('company_id', 'com_id');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('contacts', function (Blueprint $table) {
$table->renameColumn('com_id', 'company_id');
});
}
}
database/migrations/2018_06_26_080331_drop_company_id.php
+32
View File
@@ -0,0 +1,32 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class DropCompanyId extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('warehouses', function (Blueprint $table) {
$table->dropColumn('company_id');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('warehouses', function (Blueprint $table) {
//
});
}
}
public/search-contact.html
+30 -12
View File
@@ -62,7 +62,7 @@
</div>
<!-- Menu navigation start -->
<div class="cont-container">
<ul id="AddCompany" class="main-menu" style="background-color: #FFF">
<ul id="search_results" class="main-menu" style="background-color: #FFF">
</ul>
<div class="form-divider"></div>
@@ -97,21 +97,21 @@
<div class="form-row-group with-icons-no-padding">
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Company Name</label>
<label id="companyname" style="color: #000">Company Name</label>
</div>
</div>
<div class="form-divider"></div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Telephone number</label>
<label id="telno" style="color: #000">Telephone number</label>
</div>
</div>
<div class="form-divider"></div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Contact Person</label>
<label id="contactpers" style="color: #000">Contact Person</label>
</div>
</div>
<div class="form-divider"></div>
@@ -129,9 +129,10 @@
<!-- Required For All Pages, Otherwise Ugly Others Function Won't Work -->
<script type="text/javascript">
//var company_name, tel_no, contact_person;
$('#search').on('keyup', function(){
$('#AddCompany').empty();
var ul, li;
$('#search_results').empty();
var ul, li, data;
$.ajax({
type: "GET",
url: "api/company/search",
@@ -141,9 +142,9 @@
success:function(data){
console.log(data);
for(i=0; i<data.length; i++){
$('#AddCompany').append('<li style="display: show;"> <a href="#" onclick="displayCompany()"> <i class="fa fa-user"></i>' + data[i].company_name + '<span class="list-item-title-role" style="margin-top:-10px">' + data[i].tel_no + '</span> <br> <span class="list-item-title-role" style="margin-top:-10px">'+ data[i].contact_person);
$('#search_results').append('<li style="display: show;"> <a href="#" onclick="displayCompany(' + "'" + data[i].company_name + "'" + ',' + "'" + data[i].tel_no + "'" + ',' + "'" + data[i].contact_person + "'" + ',' + "'" + data[i].com_id + "'" + ')"> <i class="fa fa-user"></i>' + data[i].company_name + '<span class="list-item-title-role" style="margin-top:-10px">' + data[i].tel_no + '</span> <br> <span class="list-item-title-role" style="margin-top:-10px">'+ data[i].contact_person);
}
//$('#AddCompany').show();
//$('#searchresults').show();
},
error:function(data){
console.log(data);
@@ -151,17 +152,34 @@
});
})
//displayCompany.apply(this, data);
function displayCompany(company_name, tel_no, contact_person, com_id){
$('#companyname').text(company_name);
$('#telno').text(tel_no);
$('#contactpers').text(contact_person);
function displayCompany(){
$('#formPopup5').show();
$('#formPopup5').show();
$('#addContact').click(function() {
$.ajax({
type: "POST",
url: "api/contacts",
headers: {"Authorization": 'Bearer' + localStorage.getItem('token')},
data: {
com_id: com_id,
},
success: function(data) {
console.log(data);
}
})
})
}
// function CSearch() {
// // Declare variables
// var input, filter, ul, li, a, i;
// input = document.getElementById('searchInput');
// filter = input.value.toUpperCase();
// ul = document.getElementById("AddCompany");
// ul = document.getElementById("searchresults");
// li = ul.getElementsByTagName('li');
// if (input.value.length == 0) {
// ul.style.display = "none";
routes/api.php
+19 -14
View File
@@ -36,9 +36,7 @@ Route :: get('/warehouse','WarehouseController@index');
Route :: delete('/contacts/{contacts_id}','ContactController@destroy');
Route :: get('/contacts','ContactController@index');
Route :: post('/contacts','ContactController@store');
//Route :: post('/contacts','ContactController@store');
@@ -55,27 +53,34 @@ Route::group(['middleware' => ['jwt.auth']], function() {
return response()->json(['user'=> $request->user()]);
});
/*Delivery-Info in profile menu*/
Route::get('/deliveryinfo/','DeliveryinfoController@index');
Route::get('/deliveryinfo/{com_id}','DeliveryinfoController@show');
// Delivery-Info
Route::get('/deliveryinfo/','DeliveryinfoController@index');
Route::get('/deliveryinfo/{com_id}','DeliveryinfoController@show');
Route::post('/deliveryinfo', 'DeliveryinfoController@store');
Route::put('/deliveryinfo/{com_id}', 'DeliveryinfoController@update');
Route::delete('/deliveryinfo/{com_id}', 'DeliveryinfoController@destroy');
/* Company */
Route::patch('/company', 'CompanyController@update'); //update company information
Route::post('/company/company_profile/', 'CompanyController@companyProfile');//upload company profile picture
Route::post('/company/reg_cert/', 'CompanyController@regCert'); //upload registration certificaate
Route::post('/company/company_profile/', 'CompanyController@companyProfile');//upload company
Route::post('/company/reg_cert/', 'CompanyController@regCert'); //upload registration
/* Contacts */
Route::get('/company/search', 'CompanyController@search');
Route :: post('/contacts','ContactController@sendRequest');
Route::post('/contacts/{company_id}/request', 'ContactController@postApprove');
Route :: delete('/contacts/{contacts_id}','ContactController@destroy');
Route :: get('/contacts','ContactController@index');
});
Route::post('/company', 'CompanyController@store'); //store company information
Route::put('/company/{company}', 'CompanyController@update'); //update company information
Route::get('/company/search/{company_name}', 'CompanyController@search');
//Route::post('/company', 'CompanyController@store'); //store company information
//Route::put('/company/{company}', 'CompanyController@update'); //update company information
//Route::get('/company/search/{company_name}', 'CompanyController@search');
/* Contacts */
Route::get('/company/search', 'CompanyController@search');
//Route::get('/company/search', 'CompanyController@search');
//Route::get('/company/search/{company_name}', 'CompanyController@search');//search company in contacts
Route::post('/contacts/{company_id}/request', 'ContactController@postApprove');
//Route::post('/contacts/{company_id}/request', 'ContactController@postApprove');
//Route::post('/company', 'CompanyController@uploadImage');