Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into rate-history-refactored

app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php

@@ -0,0 +1,82 @@
+<?php
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompany;
+use App\Classes\Modules\Companies\Services\UpdatesCompanyDebtor;
+use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
+use App\Http\Resources\CompanyResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Symfony\Component\ErrorHandler\Debug;
+
+class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Company Account Status',
+            'message' => 'You have successfully updated the Company Account Status'
+        ];
+    }
+    /** @var CanUpdateCompany */
+    private $canUpdateCompany;
+
+    /** @var UpdatesCompany */
+    private $updatesCompany;
+
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var UpdatesCompanyDebtor */
+    private $updatesCompanyDebtor;
+
+    /**
+     * UpdateCompanyControllersLogic constructor.
+     * @param CanUpdateCompany $canUpdateCompany
+     * @param UpdatesCompany $updatesCompany
+     * @param FetchesCompany $fetchesCompany
+     * @param UpdatesCompanyDebtor $updatesCompanyDebtor
+     */
+    public function __construct(
+        CanUpdateCompany $canUpdateCompany,
+        UpdatesCompany $updatesCompany,
+        FetchesCompany $fetchesCompany,
+        UpdatesCompanyDebtor $updatesCompanyDebtor
+    )
+    {
+        $this->canUpdateCompany = $canUpdateCompany;
+        $this->updatesCompany = $updatesCompany;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->updatesCompanyDebtor = $updatesCompanyDebtor;
+    }
+
+    /**
+     * @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'), $request->input('reference'), $query->business_type, $request->input('type'));
+
+        $this->canUpdateCompany->passes($object);
+
+        $query = $this->updatesCompany->execute($query, $object);
+
+        if ($request->input('debtor') || $query->first()->debtor !== null) {
+            $this->updatesCompanyDebtor->execute($query, $request->input('debtor'));
+        }
+
+        return $this->resourceResponse(new CompanyResource($query));
+    }
+
+}
+

app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php

@@ -83,4 +83,4 @@ class CompanyObject implements DataTransferObject
 
 
 
-}
+}

app/Classes/Modules/Companies/Services/UpdatesCompany.php

@@ -15,7 +15,7 @@ class UpdatesCompany extends AbstractUpdateRecord
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Company $model, CompanyObject $object) 
+    public function execute(Company $model, CompanyObject $object)
     {
         $model->name = $object->getName();
         $model->reference = $object->getReference();
@@ -23,4 +23,4 @@ class UpdatesCompany extends AbstractUpdateRecord
 
         return $this->handler($model);
     }
-}
+}

app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php

@@ -11,6 +11,7 @@ class UpdatesCompanyDebtor extends AbstractUpdateRecord
 
     /**
      * @param Company $model
+     * @param CompanyObject $object
      * @param string $debtor
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
@@ -18,6 +19,7 @@ class UpdatesCompanyDebtor extends AbstractUpdateRecord
     public function execute(Company $model, string $debtor)
     {
         $model->debtor = $debtor;
+
         return $this->handler($model);
     }
-}
+}

app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyNameAndDebtorLogic;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateCompanyNameAndDebtorController extends Controller
+{
+    /**
+     * @param Request $request
+     */
+    public function update(Request $request, UpdateCompanyNameAndDebtorLogic $logic) : JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}

app/Http/Resources/BookingResource.php

@@ -11,6 +11,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Log;
 
 class BookingResource extends JsonResource
 {

app/Http/Resources/CompanyResource.php

@@ -37,6 +37,7 @@ class CompanyResource extends JsonResource
             'id' => $this->id,
             'name' => $this->name,
             'reference' => $this->reference,
+            'debtor' => $this->debtor,
             'type' => (int) $this->type,
             'business_type' => (int) $this->business_type,
             'status' => (int) $this->status,

app/Http/Resources/WalletTransactionResource.php

@@ -7,6 +7,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Transaction;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Log;
 
 class WalletTransactionResource extends JsonResource
 {
@@ -27,7 +28,14 @@ class WalletTransactionResource extends JsonResource
                 $description = 'Credit Voucher for '.$this->payment_reference;
                 break;
             case 1:
-                $marking = Transaction::where('payment_reference', $this->bill_no)->first()->owner->marking;
+                $booking = Transaction::where('payment_reference', $this->bill_no)->first()->owner;
+
+                if(!$booking) {
+                    $description = 'Payment for unknown booking, please contact tech support.';
+                    break;
+                }
+
+                $marking = $booking->marking;
                 $description = 'Payment For booking refs.'.'<a href="'.route('booking.details', $marking).'">'.$marking.'</a>';
                 break;
             case 11:

resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue

@@ -200,6 +200,14 @@
                                         </div>
                                     </div>
                                     <div class="row no-margin justify-content-end" v-if="(item.transaction_bill.status === 2 || item.transaction_bill.status === 3)">
+                                        <div class="col-auto no-padding m-l-5 requestModal pointer" v-if="$store.getters.isSuperAdmin" data-type="deletePaymentProofModal">
+                                            <div class="icon-thumbnail fs-11 text-white icon-25 bg-danger btn-rounded float-left m-r-0">
+                                                <i class="fa fa-trash fs-10"></i>
+                                            </div>
+                                            <modal-component type="deletePaymentProofModal">
+                                                <reject-payment-transaction-form-component :data="item.transaction_bill" :section="section" class="text-center"></reject-payment-transaction-form-component>
+                                            </modal-component>
+                                        </div>
                                         <div v-for="file in item.transaction_bill.documents.files" v-bind:key="file.id"  class="col-auto no-padding m-l-5">
                                             <document-file-viewer-component :file="file">
                                                 <template slot="button">
@@ -219,7 +227,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="row" v-if="$store.getters.isAdmin">
+                    <div class="row" v-if="$store.getters.isAdmin && item.transaction_bill">
                         <div class="col-6 m-auto">
                             <div class="row p-t-20 p-b-20 b-a b-dashed b-success requestModal pointer" v-if="item.transaction_bill.status === 1" data-type="paymentProofModal">
                                 <div class="col">
@@ -235,7 +243,7 @@
                                             </div>
                                         </div>
                                         <modal-component type="paymentProofModal">
-                                            <payment-proof-form-component section="paymentProofSection" :id="item.transaction_bill.id" :data="item.transaction_bill"></payment-proof-form-component>
+                                            <payment-proof-form-component :section="section" :id="item.transaction_bill.id" :data="item.transaction_bill"></payment-proof-form-component>
                                         </modal-component>
                                     </div>
                                 </div>

resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue

@@ -9,11 +9,19 @@
         <div class="col">
             <div class="row">
                 <div class="col">
-                    <div class="row align-items-center">
+                    <div class="row align-items-center parentContainer">
                         <div class="col-auto">
                             <div class="row">
                                 <div class="col">
-                                    <div class="font-heading fs-14 bold">{{item.name}}</div>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="changeCustomerName">
+                                        <change-customer-name-form-component :section="'customerProfileSection'" :data="item"></change-customer-name-form-component>
+                                    </modal-component>
+                                    <div class="font-heading fs-14 bold">
+                                        {{item.name}}
+                                        <div class="btn btn-xs b-rad-none pointer requestModal d-inline rounded no-border hover-primary" data-type="changeCustomerName" >
+                                            <i class="fa fa-edit pointer fa-fw fs-15 m-l-5"></i>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="row">
@@ -93,4 +101,4 @@
     export default {
         mixins: [componentHandler]
     }
-</script>
+</script>

resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue

@@ -0,0 +1,73 @@
+<template>
+    <div class="row" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row m-b-10">
+                <div class="col text-center">
+                    <h3>Edit Company Details</h3>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.name">
+                        <label class="text-primary">Name</label>
+                        <input class="form-control" v-model="parameters.name">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.debtor">
+                        <label class="text-primary">Debtor Code</label>
+                        <input class="form-control" v-model="parameters.debtor">
+                    </validation-wrapper-component>
+                </div>
+            </div>
+            <div class="row m-t-15">
+                <div class="col-auto p-r-5">
+                    <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
+                </div>
+                <div class="col p-l-5">
+                    <div class="btn btn-primary w-100 btn-lg" @click="submitForm">Confirm</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required, minLength } from "vuelidate/lib/validators";
+
+    export default {
+        data() {
+            return {
+                parameters: {
+                    id: this.data.id,
+                    name: this.data.name,
+                    debtor: this.data.debtor,
+                    reference: this.data.reference,
+                    type: this.data.type,
+                }
+            };
+        },
+        validations: {
+            parameters: {
+                name: {
+                    required,
+                    // minLength: minLength(8)
+                },
+                debtor: {
+                },
+            }
+        },
+        methods: {
+            successHandler(response) {
+                window.location.replace(this.route('customers', response.payload.data.reference));
+            },
+            submitForm() {
+                this.submit(this.route('api.company.update.nameAndDebtor', this.data.id), 'put', this.section, true, true)
+            }
+        },
+        mixins: [modalFormHandler]
+    }
+
+</script>

routes/company.php

@@ -9,6 +9,7 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
     Route::put('update/{id}/status', 'UpdateCompanyStatusController@update')->name('status.update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
+    Route::put('/name-and-debtor/update/{id}', 'UpdateCompanyNameAndDebtorController@update')->name('update.nameAndDebtor');
 
     Route::put('/update/debtor/{id}', 'UpdateCompanyDebtorController@update')->name('delete');
 

routes/web.php

@@ -457,18 +457,18 @@ Route::get('/1688/fix/{reference}', function($reference){
 
 Route::get('/po/manual/fix', function(){
 
-    $bookings = Booking::whereIn('company_id', [199, 510])->whereHas('documents', function($query){
-        return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
-    })->get();
-
-    foreach ($bookings as $booking){
-        $booking->status = ApprovalStatus::APPROVED;
-        $booking->save();
-
-        $booking->documents()->whereIn('document_type', [DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::INVOICE, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
-        $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->update(['status' => ApprovalStatus::PENDING_SUBMISSION]);
-
-    }
+//    $bookings = Booking::whereIn('company_id', [199, 510])->whereHas('documents', function($query){
+//        return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
+//    })->get();
+//
+//    foreach ($bookings as $booking){
+//        $booking->status = ApprovalStatus::APPROVED;
+//        $booking->save();
+//
+//        $booking->documents()->whereIn('document_type', [DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::INVOICE, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
+//        $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->update(['status' => ApprovalStatus::PENDING_SUBMISSION]);
+//
+//    }
 
 })->name('ecommerce.fix');