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

fixing bugs

Browse Source
This commit is contained in:
omair saleh
2021-05-24 00:59:33 +08:00
parent 2f7341c525
commit df83d2fc7b
10 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+2
View File
@@ -49,3 +49,5 @@ FILESYSTEM_DRIVER="documents"
JWT_SECRET=
JWT_TTL=1440
IS_PRODUCTION=false
app/Classes/General/Eloquent/Filters/PaymentApprovals.php
+1 -1
View File
@@ -14,7 +14,7 @@ class PaymentApprovals implements Filter
*/
public static function apply(Builder $builder, $value)
{
return $builder->payments()->inComplete();
return $builder->payments()->inComplete()->has('documents');
}
}
app/Http/Resources/TransactionResource.php
+1
View File
@@ -19,6 +19,7 @@ class TransactionResource extends JsonResource
return [
'id' => $this->id,
'booking' => new BookingResource($this->booking),
'type' => (int) $this->type,
'bill_no' => $this->bill_no,
'amount' => (double) $this->amount,
'original_amount' => (double) $this->original_amount,
resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
+5 -1
View File
@@ -82,7 +82,7 @@
</div>
<div class="row">
<div class="col p-r-5">
<div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="type !== 2 ? 'modal':''" @click="$emit('close')">Cancel</div>
<div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" :data-dismiss="closable ? 'modal' : ''" @click="$emit('close')">Cancel</div>
</div>
<div class="col p-l-5">
<div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Add Account</div>
@@ -106,6 +106,10 @@
type: Number,
default: 1
},
closable: {
type: Boolean,
default: true
},
country_id: {
type: Number,
default: 1
resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+1 -1
View File
@@ -145,7 +145,7 @@
</div>
<div class="row" v-show="createBank">
<div class="col">
<bank-account-form-component section="customerProfileSection" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" v-on:close="createBank = !createBank"></bank-account-form-component>
<bank-account-form-component section="customerProfileSection" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :closable=false v-on:close="createBank = !createBank"></bank-account-form-component>
</div>
</div>
</div>
resources/assets/vue/components/bookings/elements/PaymentVerificationComponent.vue
+25 -10
View File
@@ -14,26 +14,29 @@
</div>
</div>
<div class="col-auto">
<div class="font-heading fs-10 muted all-caps">Amount</div>
<div class="font-heading fs-12 text-success bold">
MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
</div>
<div class="font-heading fs-10 muted all-caps">Transfer No.</div>
<a :href="route('booking.details', item.booking.marking)">
<div class="font-heading fs-10">
{{item.booking.marking}}
</div>
</a>
</div>
<div class="col">
<div class="font-heading fs-10 muted all-caps">Original</div>
<div class="col-auto">
<div class="font-heading fs-10 muted all-caps">Marking</div>
<div class="font-heading fs-10">
{{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
{{item.booking.company.reference}}
</div>
</div>
<div class="col-auto text-right">
<div class="col text-right">
<div class="font-heading fs-10 muted all-caps">Date</div>
<div class="font-heading fs-10">
{{item.updated_at}}
</div>
</div>
</div>
<div class="row align-items-end">
<div class="col">
<div class="row m-t-10">
<div class="col-auto">
<div class="font-heading fs-10 muted all-caps">Payment Proof</div>
<div class="row no-margin">
<div v-if="item.documents != null">
<div v-for="file in item.documents.files" v-bind:key="file.id" class="col-auto no-padding m-r-5">
@@ -48,6 +51,18 @@
</div>
</div>
</div>
<div class="col-auto">
<div class="font-heading fs-10 muted all-caps">Amount</div>
<div class="font-heading fs-12 text-success bold">
MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
</div>
</div>
<div class="col">
<div class="font-heading fs-10 muted all-caps">Original</div>
<div class="font-heading fs-10">
{{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
</div>
</div>
<div class="col-auto text-right">
<button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="rejectPayment">
<i class="fa fa-times fa-fw"></i>
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+1 -1
View File
@@ -335,7 +335,7 @@
<div class="col-auto p-l-0">
<div class="font-heading fs-8 muted all-caps">Payment Amount</div>
<div class="font-heading fs-10 bold">
{{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
{{ item.type === 3 ? item.original_currency.short_code : item.currency.short_code}} {{(Math.round((item.type === 3 ? item.original_amount : item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
</div>
</div>
</div>
resources/views/pages/banks/customers.blade.php
+4 -4
View File
@@ -1,15 +1,15 @@
<div class="row d-none" :class="[{'d-flex': !$store.getters.isAdmin}]" v-if="!$store.getters.isAdmin">
<div class="col bg-white p-l-25 p-r-25 p-t-15 p-b-15">
<div class="col-6 bg-white p-l-25 p-r-25 p-t-15 p-b-15">
<div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
<div class="col">
<div class="font-heading all-caps fs-10 hint-text">
Customer's Bank Accounts
Recipients Bank Accounts
</div>
</div>
<div class="col-auto">
<button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
<i class="fa fa-plus m-r-5"></i>
Add New Bank Account
Add New Recipient
</button>
<modal-form-component section="banksSection">
<template slot="form" slot-scope="{section}">
@@ -18,7 +18,7 @@
</modal-form-component>
</div>
</div>
<div class="row m-b-20">
<div class="row m-b-20 m-r-0">
<div class="col">
<list-component section="banksSection" :endpoint="route('api.bank.list')" :options="{'company_id': this.$store.getters.getCompanyId}">
<template slot="list" slot-scope="{data}">
resources/views/pages/booking_details.blade.php
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="row">
<div class="col">
<booking-details-section-component :marking={{$marking}}></booking-details-section-component>
@if(!App()->environment('production'))
@if(!env('IS_PRODUCTION'))
<a class="btn btn-xs all-caps b-rad-none btn-warning" href="{{ route('booking.merge', $marking)}}">Merge Transfer Orders</a>
@endif
</div>
resources/views/partials/header.blade.php
+4 -2
View File
@@ -22,8 +22,9 @@
<div class="col text-right p-r-30 ">
<div class="row justify-content-end">
<div class="col text-left">
<div class="row justify-content-start">
<div class="col-auto p-r-20 hide">
@if(!env('IS_PRODUCTION'))
<div class="row justify-content-end">
<div class="col-auto p-r-20">
<a href="{{route('dashboard')}}"><div class="text-white all-caps fs-12">Dashboard</div></a>
</div>
<div class="col-auto p-r-20 hide">
@@ -36,6 +37,7 @@
<a href="{{route('bank')}}"><div class="text-white all-caps fs-12">Bank Accounts</div></a>
</div>
</div>
@endif
</div>
</div>
</div>