mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git
synced 2026-08-19 12:34:18 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 834ea52a4f | |||
| 551fb7deaa | |||
| 2248e76bd4 |
@@ -0,0 +1,63 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Classes\Modules\Accounts\ControllersLogic;
|
||||||
|
|
||||||
|
use App\Classes\Modules\Accounts\Services\FetchesUser;
|
||||||
|
use App\Classes\Modules\Accounts\Standards\Rules\CanFetchUser;
|
||||||
|
use App\Classes\General\Abstracts\AbstractControllerLogic;
|
||||||
|
use App\Http\Resources\UserCompanyResource;
|
||||||
|
use ErrorException;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class FetchUserByEmailLogic extends AbstractControllerLogic
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
protected function notification():array {
|
||||||
|
return [
|
||||||
|
'title' => 'Fetch Users',
|
||||||
|
'message' => 'You have successfully retrieved the user by email'
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var CanFetchUser */
|
||||||
|
private $canFetchUser;
|
||||||
|
|
||||||
|
/** @var FetchesUser */
|
||||||
|
private $fetchesUser;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* FetchUserByEmailLogic constructor.
|
||||||
|
* @param CanFetchUser $canFetchUser
|
||||||
|
* @param FetchesUser $fetchessUser
|
||||||
|
*/
|
||||||
|
public function __construct(CanFetchUser $canFetchUser, FetchesUser $fetchesUser)
|
||||||
|
{
|
||||||
|
$this->canFetchUser = $canFetchUser;
|
||||||
|
$this->fetchesUser = $fetchesUser;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Request $request
|
||||||
|
* @return JsonResponse
|
||||||
|
* @throws ErrorException
|
||||||
|
*/
|
||||||
|
public function logic(Request $request) : JsonResponse
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
|
||||||
|
$this->canFetchUser->passes();
|
||||||
|
|
||||||
|
$query = $this->fetchesUser->execute(['email' => $request->route('email')]);
|
||||||
|
|
||||||
|
return $this->resourceResponse(new UserCompanyResource($query));
|
||||||
|
|
||||||
|
} catch (\Exception $exception){
|
||||||
|
throw new ErrorException($exception->getMessage(), $exception->getCode());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Classes\Modules\Companies\ControllersLogic;
|
|
||||||
|
|
||||||
|
|
||||||
use App\Classes\General\Abstracts\AbstractControllerLogic;
|
|
||||||
|
|
||||||
use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
|
|
||||||
use App\Classes\Modules\Companies\Services\FetchesCompany;
|
|
||||||
use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
|
|
||||||
use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
|
|
||||||
use App\Classes\Modules\Companies\Services\UpdatesCompanyName;
|
|
||||||
use App\Http\Resources\CompanyResource;
|
|
||||||
use ErrorException;
|
|
||||||
use Illuminate\Http\JsonResponse;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
|
|
||||||
class UpdateCompanyNameLogic extends AbstractControllerLogic
|
|
||||||
{
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
protected function notification():array {
|
|
||||||
return [
|
|
||||||
'title' => 'Updated Company',
|
|
||||||
'message' => 'You have successfully updated the Company'
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @var FetchesCompany */
|
|
||||||
private $fetchesCompany;
|
|
||||||
|
|
||||||
/** @var UpdatesCompanyName */
|
|
||||||
private $updatesCompanyName;
|
|
||||||
|
|
||||||
/** @var UpdatesCompanyModuleName */
|
|
||||||
private $updatesCompanyModuleName;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* UpdateCompanyControllersLogic constructor.
|
|
||||||
* @param FetchesCompany $fetchesCompany
|
|
||||||
* @param UpdatesCompanyName $updatesCompany
|
|
||||||
* @param UpdatesCompanyModuleName $updatesCompanyModuleName
|
|
||||||
*/
|
|
||||||
public function __construct(FetchesCompany $fetchesCompany,UpdatesCompanyName $updatesCompanyName, UpdatesCompanyModuleName $updatesCompanyModuleName)
|
|
||||||
{
|
|
||||||
$this->fetchesCompany = $fetchesCompany;
|
|
||||||
$this->updatesCompanyName = $updatesCompanyName;
|
|
||||||
$this->updatesCompanyModuleName = $updatesCompanyModuleName;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param Request $request
|
|
||||||
* @return JsonResponse
|
|
||||||
* @throws ErrorException
|
|
||||||
*/
|
|
||||||
public function logic(Request $request) : JsonResponse
|
|
||||||
{
|
|
||||||
$query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
|
|
||||||
|
|
||||||
$object = new CompanyObject($request->input('name'), $query->reference, $query->type);
|
|
||||||
|
|
||||||
$this->updatesCompanyName->execute($query, $object);
|
|
||||||
|
|
||||||
$this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
|
|
||||||
|
|
||||||
return $this->resourceResponse(new CompanyResource($query));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Classes\Modules\Companies\Services;
|
|
||||||
|
|
||||||
use App\Classes\General\Eloquent\AbstractUpdateRecord;
|
|
||||||
use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
|
|
||||||
use App\Models\Company;
|
|
||||||
|
|
||||||
class UpdatesCompanyName extends AbstractUpdateRecord
|
|
||||||
{
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param Company $model
|
|
||||||
* @param int $status
|
|
||||||
* @return \Illuminate\Database\Eloquent\Model
|
|
||||||
* @throws \App\Classes\Exceptions\MalformedRequestException
|
|
||||||
*/
|
|
||||||
public function execute(Company $model, CompanyObject $object)
|
|
||||||
{
|
|
||||||
$model->name = $object->getName();
|
|
||||||
return $this->handler($model);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Controllers\Accounts;
|
||||||
|
|
||||||
|
|
||||||
|
use App\Classes\Modules\Accounts\ControllersLogic\FetchUserByEmailLogic;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class FetchUserByEmailController
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Request $request
|
||||||
|
* @param FetchUserByEmailLogic $logic
|
||||||
|
* @return JsonResponse
|
||||||
|
*/
|
||||||
|
public function fetch(Request $request, FetchUserByEmailLogic $logic): JsonResponse {
|
||||||
|
return $logic->execute($request);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Controllers\Companies;
|
|
||||||
|
|
||||||
use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyNameLogic;
|
|
||||||
use App\Http\Controllers\Controller;
|
|
||||||
use Illuminate\Http\JsonResponse;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
|
|
||||||
class UpdateCompanyNameController extends Controller
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @param Request $request
|
|
||||||
* @param UpdateCompanyLogic $logic
|
|
||||||
* @return JsonResponse
|
|
||||||
*/
|
|
||||||
public function rename(Request $request, UpdateCompanyNameLogic $logic): JsonResponse
|
|
||||||
{
|
|
||||||
return $logic->execute($request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Http\Controllers\PackingLists\Containers;
|
namespace App\Http\Controllers\PackingLists\Packages;
|
||||||
|
|
||||||
use App\Classes\Modules\PackingLists\ControllersLogic\Containers\InboundCustomClearedLogic;
|
use App\Classes\Modules\PackingLists\ControllersLogic\Containers\InboundCustomClearedLogic;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Http\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class UserCompanyResource extends JsonResource
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Transform the resource into an array.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function toArray($request)
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'name' => $this->name,
|
||||||
|
'reference' => $this->companyModule()->first()->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference,
|
||||||
|
'type' => (int) $this->type,
|
||||||
|
'status' => (int) $this->status,
|
||||||
|
'email' => $this->email
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<template>
|
||||||
|
<div class="row m-b-15 align-items-end">
|
||||||
|
<div class="col-auto">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<div class="font-heading fs-10 muted all-caps">Name</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<div class="font-heading all-caps fs-11">{{this.item.name}}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-2 text-right">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<div class="font-heading fs-10 muted all-caps">Reference</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<div class="font-heading all-caps fs-11">{{this.item.reference}}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-auto">
|
||||||
|
<a :href="route('customer.profile', this.item.reference)" target="_blank">
|
||||||
|
<button type="button" class="btn btn-xs btn-primary fs-11">Open in new tab</button>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<script>
|
||||||
|
import componentHandler from '../../../general/mixins/componentHandler';
|
||||||
|
export default {
|
||||||
|
mixins: [componentHandler]
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
<template>
|
||||||
|
<div class="row" @keyup.enter="fetchReport">
|
||||||
|
<div class="col">
|
||||||
|
<div class="row m-b-15">
|
||||||
|
<div class="col-8 p-r-0">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col p-r-0">
|
||||||
|
<div class="form-group no-margin form-group-default b-rad-none">
|
||||||
|
<label class="text-primary">Email</label>
|
||||||
|
<input type="text" class="form-control" v-model="email" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col p-l-0">
|
||||||
|
<div class="btn btn-primary b-rad-none" @click="fetchReport()">
|
||||||
|
<i class="fa fa-search lh-40"></i>
|
||||||
|
</div>
|
||||||
|
<div class="btn btn-secondary b-rad-none" @click="resetSearch()">
|
||||||
|
<i class="fa fa-remove lh-40"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row" v-if="search">
|
||||||
|
<div class="col bg-white padding-25">
|
||||||
|
<p v-if="!userCompany">{{ message }}</p>
|
||||||
|
<loading-component v-if="isLoading"></loading-component>
|
||||||
|
<user-company-component v-if="userCompany" :data="userCompany"></user-company-component>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<script>
|
||||||
|
|
||||||
|
import LoadingComponent from "../../general/elements/LoadingComponent";
|
||||||
|
export default {
|
||||||
|
components: {LoadingComponent},
|
||||||
|
data(){
|
||||||
|
return {
|
||||||
|
section: 'searchUserCompanyByEmailSection',
|
||||||
|
isLoading: false,
|
||||||
|
search: false,
|
||||||
|
email: '',
|
||||||
|
userCompany: null,
|
||||||
|
message: 'Searching...'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
validations: {
|
||||||
|
marking: {},
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
fetchReport(){
|
||||||
|
this.isLoading = true;
|
||||||
|
this.search = true;
|
||||||
|
this.userCompany = null;
|
||||||
|
this.message = 'Searching...';
|
||||||
|
this.submit(route('api.account.user.company', this.email), 'get', this.section, false, false);
|
||||||
|
},
|
||||||
|
successHandler(response){
|
||||||
|
this.isLoading = false;
|
||||||
|
this.report = response.payload.data;
|
||||||
|
if(response.payload.data != undefined)
|
||||||
|
this.userCompany = response.payload.data;
|
||||||
|
else
|
||||||
|
this.message = 'Customer not found';
|
||||||
|
},
|
||||||
|
errorHandler(response){
|
||||||
|
this.isLoading = false;
|
||||||
|
this.userCompany = null;
|
||||||
|
this.message = 'Customer not found';
|
||||||
|
},
|
||||||
|
resetSearch() {
|
||||||
|
this.userCompany = null;
|
||||||
|
this.search = false;
|
||||||
|
this.email = '';
|
||||||
|
message: 'Searching...';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
<div class="row" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
|
<div class="row" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<customer-activity-report-section-component></customer-activity-report-section-component>
|
<customer-activity-report-section-component></customer-activity-report-section-component>
|
||||||
|
<search-customer-by-email-component></search-customer-by-email-component>
|
||||||
<div class="row" v-show="!$store.getters.isShowing('customerActivityReportSection')">
|
<div class="row" v-show="!$store.getters.isShowing('customerActivityReportSection')">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<customer-report-section-component></customer-report-section-component>
|
<customer-report-section-component></customer-report-section-component>
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account
|
|||||||
});
|
});
|
||||||
|
|
||||||
Route::group(['middleware' => 'valid.token', 'prefix' => 'user', 'as' => 'user.'], function () {
|
Route::group(['middleware' => 'valid.token', 'prefix' => 'user', 'as' => 'user.'], function () {
|
||||||
|
Route::get('/{email}', 'FetchUserByEmailController@fetch')->name('company');
|
||||||
Route::post('/show', 'FetchUserController@fetch')->name('show');
|
Route::post('/show', 'FetchUserController@fetch')->name('show');
|
||||||
Route::get('/list', 'ListUsersController@list')->name('list');
|
Route::get('/list', 'ListUsersController@list')->name('list');
|
||||||
Route::put('/update/{id}', 'UpdateUserController@update')->name('update');
|
Route::put('/update/{id}', 'UpdateUserController@update')->name('update');
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
|
|||||||
Route::post('/create', 'CreateCompanyController@create')->name('create');
|
Route::post('/create', 'CreateCompanyController@create')->name('create');
|
||||||
Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
|
Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
|
||||||
Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
|
Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
|
||||||
Route::put('/name/update/{id}', 'UpdateCompanyNameController@rename')->name('update.name');
|
|
||||||
|
|
||||||
Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
|
Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ Route::group(['namespace' => 'PackingLists', 'as' => 'packing_list.', 'prefix' =
|
|||||||
Route::get('/inbound-custom-cleared', 'InboundCustomClearedController@list')->name('list.inbound.custom.cleared');
|
Route::get('/inbound-custom-cleared', 'InboundCustomClearedController@list')->name('list.inbound.custom.cleared');
|
||||||
Route::put('/switch-packing-list/{id}', 'SwitchPackagePackingListController@switch')->name('switch.packing_list');
|
Route::put('/switch-packing-list/{id}', 'SwitchPackagePackingListController@switch')->name('switch.packing_list');
|
||||||
|
|
||||||
Route::group(['namespace' => 'PackageItems', 'prefix' => 'item', 'as' => 'item.'], function () {
|
Route::group(['namespace' => 'Items', 'prefix' => 'item', 'as' => 'item.'], function () {
|
||||||
Route::get('/{id}/show', 'FetchPackageItemController@fetch')->name('show');
|
Route::get('/{id}/show', 'FetchPackageItemController@fetch')->name('show');
|
||||||
Route::get('/list', 'ListPackageItemsController@list')->name('list');
|
Route::get('/list', 'ListPackageItemsController@list')->name('list');
|
||||||
Route::post('/create', 'CreatePackageItemController@create')->name('create');
|
Route::post('/create', 'CreatePackageItemController@create')->name('create');
|
||||||
|
|||||||
Reference in New Issue
Block a user