cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-22 14:04:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

add back missing codes from - update payment and billings documents

Browse Source
This commit is contained in:
edmondlang
2022-02-15 23:56:34 +08:00
parent 67ba347fe4
commit 61eda2291a
15 changed files with 457 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyLogic.php
+5 -13
View File
@@ -56,23 +56,15 @@ class UpdateCompanyLogic extends AbstractControllerLogic
*/
public function logic(Request $request) : JsonResponse
{
try {
$object = new CompanyObject($request->input('name'), $request->input('reference'), $request->input('type'));
$object = new CompanyObject($request->input('reference_no'), $request->input('name'), $request->input('type'));
$this->canUpdateCompany->passes($object);
$this->canUpdateCompany->passes($object);
$query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
$query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
$query = $this->updatesCompany->execute($query, $object);
return $this->resourceResponse(new CompanyResource($query));
} catch (\Exception $exception){
throw new ErrorException($exception->getMessage(), $exception->getCode());
}
$query = $this->updatesCompany->execute($query, $object);
return $this->resourceResponse(new CompanyResource($query));
}
}
app/Classes/Modules/Documents/ControllersLogic/DeleteDocumentLogic.php
+70
View File
@@ -0,0 +1,70 @@
<?php
namespace App\Classes\Modules\Documents\ControllersLogic;
use App\Classes\Modules\Documents\Standards\Rules\CanDeleteDocument;
use App\Http\Resources\DocumentResource;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Documents\Services\FetchesDocument;
use App\Classes\Modules\Documents\Services\DeletesDocument;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
class DeleteDocumentLogic extends AbstractControllerLogic
{
/**
* @return array
*/
protected function notification():array {
return [
'title' => 'Deleted Document',
'message' => 'You have successfully deleted a document'
];
}
/** @var FetchesDocument */
private $fetchesDocument;
/** @var DeletesDocument */
private $deletesDocument;
/** @var CanDeleteDocument */
private $canDeleteDocument;
/**
* DeleteDocumentLogic constructor.
* @param FetchesDocument $fetchesDocument
* @param DeletesDocument $deletesDocument
* @param CanDeleteDocument $canDeleteDocument
*/
public function __construct(FetchesDocument $fetchesDocument, DeletesDocument $deletesDocument, CanDeleteDocument $canDeleteDocument)
{
$this->fetchesDocument = $fetchesDocument;
$this->deletesDocument = $deletesDocument;
$this->canDeleteDocument = $canDeleteDocument;
}
/**
* @param Request $request
* @return JsonResponse
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function logic(Request $request) : JsonResponse
{
$document = $this->fetchesDocument->execute(['id' => $request->route('id')]);
$this->canDeleteDocument->passes();
$this->deletesDocument->execute($document);
return $this->response([]);
}
}
app/Classes/Modules/Documents/ControllersLogic/UpdateDocumentReferenceLogic.php
+68
View File
@@ -0,0 +1,68 @@
<?php
namespace App\Classes\Modules\Documents\ControllersLogic;
use App\Classes\Modules\Documents\Standards\Rules\CanUpdateDocumentReference;
use App\Http\Resources\DocumentResource;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Documents\Services\FetchesDocument;
use App\Classes\Modules\Documents\Services\UpdatesDocumentReference;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class UpdateDocumentReferenceLogic extends AbstractControllerLogic
{
/**
* @return array
*/
protected function notification():array {
return [
'title' => 'Update Document',
'message' => 'You have successfully updated the Document'
];
}
/** @var CanUpdateDocumentReference*/
private $canUpdateDocumentReference;
/** @var UpdatesDocumentReference */
private $updatesDocumentReference;
/** @var FetchesDocument */
private $fetchesDocument;
/**
* RejectDocumentLogic constructor.
* @param CanApproveDocument $canApproveDocument
* @param ApprovesDocument $approvesDocument
* @param FetchesDocument $fetchesDocument
*/
public function __construct(CanUpdateDocumentReference $canUpdateDocumentReference, UpdatesDocumentReference $updatesDocumentReference, FetchesDocument $fetchesDocument)
{
$this->canUpdateDocumentReference = $canUpdateDocumentReference;
$this->updatesDocumentReference = $updatesDocumentReference;
$this->fetchesDocument = $fetchesDocument;
}
/**
* @param Request $request
* @return JsonResponse
* @throws \App\Classes\Exceptions\AccessForbiddenException
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\RequestValidationException
*/
public function logic(Request $request) : JsonResponse
{
$document = $this->fetchesDocument->execute(['id' => $request->route('id')]);
$this->canUpdateDocumentReference->passes();
$document_query = $this->updatesDocumentReference->execute($document, $request->input('identification_number'));
return $this->resourceResponse(new DocumentResource($document_query));
}
}
app/Classes/Modules/Documents/Services/UpdatesDocument.php
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace App\Classes\Modules\Documents\Services;
use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Models\Document;
class UpdatesDocument extends AbstractUpdateRecord
{
/**
* @param Document $model
* @return mixed
*/
public function execute(Document $model) {
return $this->handler($model);
}
}
app/Classes/Modules/Documents/Services/UpdatesDocumentReference.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\Classes\Modules\Documents\Services;
use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Models\Document;
class UpdatesDocumentReference extends AbstractUpdateRecord
{
/**
* @param Document $model
* @return mixed
*/
public function execute(Document $model, string $reference) {
$model->reference = $reference;
return $this->handler($model);
}
}
app/Classes/Modules/Documents/Standards/Rules/CanDeleteDocument.php
+39
View File
@@ -0,0 +1,39 @@
<?php
namespace App\Classes\Modules\Documents\Standards\Rules;
use App\Classes\General\Abstracts\AbstractRule;
class CanDeleteDocument extends AbstractRule
{
/**
* @return bool
*/
protected function authorized(): bool
{
// TODO Set Authorization rules
return true;
}
/**
* @param $object
* @return bool
*/
protected function validators($object): bool
{
return true;
}
/**
* @param $object
* @return bool
*/
protected function criteria($object): bool
{
return true;
}
}
app/Classes/Modules/Documents/Standards/Rules/CanUpdateDocumentReference.php
+39
View File
@@ -0,0 +1,39 @@
<?php
namespace App\Classes\Modules\Documents\Standards\Rules;
use App\Classes\General\Abstracts\AbstractRule;
use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
class CanUpdateDocumentReference extends AbstractRule
{
/**
* @return bool
*/
protected function authorized(): bool
{
// TODO Set Authorization rules
return true;
}
/**
* @param DocumentObject $object
* @return bool
* @throws \App\Classes\Exceptions\RequestValidationException
*/
protected function validators($object): bool
{
return true;
}
/**
* @param DocumentObject $object
* @return bool
*/
protected function criteria($object): bool
{
return true;
}
}
app/Http/Controllers/Documents/ApproveDocumentController.php
+2 -2
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Documents;
use App\Classes\Modules\Documents\ControllersLogic\ApproveIdentificationDocumentLogic;
use App\Classes\Modules\Documents\ControllersLogic\ApproveDocumentLogic;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -13,7 +13,7 @@ class ApproveDocumentController
* @param ApproveIdentificationDocumentLogic $logic
* @return JsonResponse
*/
public function approve(Request $request, ApproveIdentificationDocumentLogic $logic): JsonResponse {
public function approve(Request $request, ApproveDocumentLogic $logic): JsonResponse {
return $logic->execute($request);
}
app/Http/Controllers/Documents/DeleteDocumentController.php
+14
View File
@@ -0,0 +1,14 @@
<?php
namespace App\Http\Controllers\Documents;
use App\Classes\Modules\Documents\ControllersLogic\DeleteDocumentLogic;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class DeleteDocumentController
{
public function delete(Request $request, DeleteDocumentLogic $logic): JsonResponse {
return $logic->execute($request);
}
}
app/Http/Controllers/Documents/UpdateDocumentReferenceController.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\Http\Controllers\Documents;
use App\Classes\Modules\Documents\ControllersLogic\UpdateDocumentReferenceLogic;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class UpdateDocumentReferenceController
{
/**
* @param Request $request
* @param UpdateDocumentReferenceLogic $logic
* @return JsonResponse
*/
public function update(Request $request, UpdateDocumentReferenceLogic $logic): JsonResponse {
return $logic->execute($request);
}
}
resources/assets/vue/components/bookings/elements/CurrencyOrderComponent.vue
+39 -2
View File
@@ -26,7 +26,7 @@
</div>
</div>
</div>
<div class="col-auto">
<div v-if="item.status === 1" class="col-auto">
<div class="row parentContainer">
<div class="col p-l-0">
<button class="btn btn-xs btn-default bg-success b-rad-none no-border requestModal" data-type="approveDocument">
@@ -59,6 +59,39 @@
</div>
</div>
</div>
<div v-if="item.status === 2" class="col-auto">
<div class="row parentContainer">
<div class="col p-l-0">
<button class="btn btn-xs btn-default bg-danger b-rad-none no-border requestModal" data-type="deleteDocument">
<i class="fa fa-times text-white"></i>
</button>
<modal-component small type="deleteDocument">
<div class="row">
<div class="col text-center">
<div class="row">
<div class="col text-center">
<div class="row m-b-20">
<div class="col">
<h5 class="all-caps">Are you Sure?</h5>
<div class="fs-11">Are you sure you want to delete this docuement?</div>
</div>
</div>
<div class="row">
<div class="col p-r-5">
<div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
</div>
<div class="col p-l-5">
<div data-dismiss="modal" class="btn btn-sm btn-danger btn-block b-rad-none" @click="deleteDocument()">Delete</div>
</div>
</div>
</div>
</div>
</div>
</div>
</modal-component>
</div>
</div>
</div>
</div>
</div>
@@ -79,8 +112,12 @@
methods: {
approveDocument(status){
this.isLoading = true;
this.submit(this.route('api.company.identification.approval', this.item.owner.id, this.item.id, status), 'put', 'identificationVerificationSection', true, true);
this.submit(this.route('api.document.status.approve', this.item.id, status), 'put', 'identificationVerificationSection', true, true);
},
deleteDocument() {
this.isLoading = true;
this.submit(this.route('api.document.delete', this.item.id), 'delete', 'identificationVerificationSection', true, true);
}
},
mixins: [componentHandler, staticFormHandler]
}
resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
+32 -6
View File
@@ -42,16 +42,28 @@
</div>
</div>
</div>
<div class="row m-b-15" v-if="item.owner.type === 1">
<div class="row m-b-15">
<div class="col">
<div class="row m-b-5">
<div class="col">
<div class="fs-8 all-caps muted">Company Name</div>
</div>
</div>
<div class="row">
<div class="row" v-if="isEditCompanyName === false">
<div class="col">
<div class="fs-11 text-primary">{{item.owner.name}}</div>
<div class="fs-11 text-primary">{{item.owner.name}} <i class="fa fa-edit pointer fa-fw m-l-5" v-if="$store.getters.isSuperAdmin" @click="isEditCompanyName = !isEditCompanyName"></i></div>
</div>
</div>
<div class="row" v-if="isEditCompanyName === true">
<div class="col">
<update-company-name-form-component :section="section" :data="item.owner" v-on:submit="isEditCompanyName=false"></update-company-name-form-component>
</div>
<div class="col-auto d-flex align-items-center">
<div class="row">
<div class="col b-none btn btn-sm btn-danger" @click="isEditCompanyName = !isEditCompanyName">
<i class="fa fa-times"></i>
</div>
</div>
</div>
</div>
</div>
@@ -63,9 +75,21 @@
<div class="fs-8 all-caps muted">{{ item.owner.type === 0 ? 'IC' : 'SSM Registration' }} Number</div>
</div>
</div>
<div class="row">
<div class="row" v-if="isEditIdentificationNumber === false">
<div class="col">
<div class="fs-11 text-primary bold">{{item.reference}}</div>
<div class="fs-11 text-primary bold">{{item.reference}} <i class="fa fa-edit pointer fa-fw m-l-5" v-if="$store.getters.isSuperAdmin" @click="isEditIdentificationNumber = !isEditIdentificationNumber"></i></div>
</div>
</div>
<div class="row" v-if="isEditIdentificationNumber === true">
<div class="col">
<update-identification-number-form-component :section="section" :data="{identification_number: item.reference}" :id="item.id" v-on:submit="isEditIdentificationNumber=false"></update-identification-number-form-component>
</div>
<div class="col-auto d-flex align-items-center">
<div class="row">
<div class="col b-none btn btn-sm btn-danger" @click="isEditIdentificationNumber = !isEditIdentificationNumber">
<i class="fa fa-times"></i>
</div>
</div>
</div>
</div>
</div>
@@ -168,7 +192,9 @@
export default {
data() {
return {
expanded: false
expanded: false,
isEditIdentificationNumber: false,
isEditCompanyName: false,
}
},
methods: {
resources/assets/vue/components/companies/elements/UpdateCompanyNameFormComponent.vue
+38
View File
@@ -0,0 +1,38 @@
<template>
<div class="row">
<div class="col p-r-0">
<validation-wrapper-component :validator="$v.parameters.name">
<input type="text" class="form-control fs-12" placeholder="Edit company name" v-model.trim="parameters.name">
</validation-wrapper-component>
</div>
<div class="col-auto bg-success d-flex justify-content-center align-items-center pointer text-white">
<i class="fa fa-check" @click="submitForm"></i>
</div>
</div>
</template>
<script>
import modalFormHandler from '../../../general/mixins/modalFormHandler';
import { required } from "vuelidate/lib/validators";
export default {
data() {
return {
name: this.data.name,
};
},
validations: {
parameters: {
name: { required },
}
},
methods: {
submitForm() {
this.parameters.name = this.data.name;
this.submit(this.route('api.company.update', this.data.id), 'put', '', false, false);
this.$emit('submit');
}
},
mixins: [modalFormHandler]
}
</script>
resources/assets/vue/components/companies/elements/UpdateIdentificationNumberFormComponent.vue
+49
View File
@@ -0,0 +1,49 @@
<template>
<div class="row">
<div class="col p-r-0">
<validation-wrapper-component :validator="$v.parameters.identification_number">
<input type="text" class="form-control fs-12" placeholder="Edit identification number" v-model.trim="parameters.identification_number">
</validation-wrapper-component>
</div>
<div class="col-auto bg-success d-flex justify-content-center align-items-center pointer text-white">
<i class="fa fa-check" @click="submitForm"></i>
</div>
</div>
</template>
<script>
import modalFormHandler from '../../../general/mixins/modalFormHandler';
import { required } from "vuelidate/lib/validators";
export default {
props: {
id: {
type: Number,
required: true
}
},
data() {
return {
parameters: {
identification_number: this.identification_number,
},
};
},
validations: {
parameters: {
identification_number: { required },
}
},
created() {
if (this.data) {
this.parameters.identification_number = this.data.identification_number
}
},
methods: {
submitForm() {
this.submit(this.route('api.document.reference.update', this.id), 'put', '', false, false);
this.$emit('submit')
}
},
mixins: [modalFormHandler]
}
</script>
routes/document.php
+3
View File
@@ -4,6 +4,9 @@ use Illuminate\Support\Facades\Route;
Route::group(['prefix' => 'document', 'as' => 'document.', 'namespace' => 'Documents'], function () {
Route::get('/list', 'ListDocumentsController@list')->name('list');
Route::delete('/{id}/delete', 'DeleteDocumentController@delete')->name('delete');
Route::put('/{id}/approve', 'ApproveDocumentController@approve')->name('status.approve');
Route::put('/{id}/reject', 'RejectDocumentController@reject')->name('status.reject');
Route::put('/{id}/reference/update', 'UpdateDocumentReferenceController@update')->name('reference.update');
});