shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1788 from CihanSenturk/master

Browse Source 
portal payment card issues
This commit is contained in:
Cüneyt Şentürk 2021-01-20 16:25:50 +03:00 committed by GitHub
commit 10e0afa150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
resources/assets/js/components/CreditCard/CardForm.vue
View File

@ -3,10 +3,10 @@
<div class="row align-items-center" v-if="Object.keys(cards).length"> <div class="row align-items-center" v-if="Object.keys(cards).length">
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label for="item_name" class="form-control-label">Cards</label> <label for="item_name" class="form-control-label">{{ textCard }}</label>
<div class="input-group-invoice-text" v-for="(name, key, id) in cards"> <div class="input-group-invoice-text" v-for="(name, key, id) in cards">
<div class="custom-radio mb-2"> <div class="custom-radio mb-2">
<button type="button" <button type="button"
:id="'card-'+ key + '-' + id" :id="'card-'+ key + '-' + id"
class="btn btn-outline-default w-100" class="btn btn-outline-default w-100"
@click="onSelectedCard(key)" @click="onSelectedCard(key)"
@ -21,19 +21,19 @@
<div class="input-group-invoice-text"> <div class="input-group-invoice-text">
<div class="custom-radio mb-2"> <div class="custom-radio mb-2">
<button type="button" <button type="button"
id="card-new-card" id="card-new-card"
class="btn btn-outline-default w-100" class="btn btn-outline-default w-100"
data-toggle="collapse" data-toggle="collapse"
data-target="#collapseNewCard" data-target="#collapseNewCard"
aria-expanded="false" aria-expanded="false"
aria-controls="collapseNewCard" aria-controls="collapseNewCard"
:disabled="loading">New Card</button> :disabled="loading">{{ textNewCard }}</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="collapse w-100" id="collapseNewCard"> <div class="collapse w-100" id="collapseNewCard">
<div class="row"> <div class="row">
<div class="col-md-6 p-5"> <div class="col-md-6 p-5">
@ -148,8 +148,8 @@
<div class="form-group" v-if="storeCard"> <div class="form-group" v-if="storeCard">
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input @input="changeStoreCard" id="store_card" name="store_card" type="checkbox" value="true" class="custom-control-input"> <input @input="changeStoreCard" :id="'store_card' + _uid" name="store_card" type="checkbox" value="true" class="custom-control-input">
<label for="store_card" class="custom-control-label"> <label :for="'store_card' + _uid" class="custom-control-label">
<strong>{{ textStoreCard }}</strong> <strong>{{ textStoreCard }}</strong>
</label> </label>
</div> </div>
@ -307,8 +307,8 @@
<div class="form-group" v-if="storeCard"> <div class="form-group" v-if="storeCard">
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input @input="changeStoreCard" id="store_card" name="store_card" type="checkbox" value="true" class="custom-control-input"> <input @input="changeStoreCard" :id="'store_card' + _uid" name="store_card" type="checkbox" value="true" class="custom-control-input">
<label for="store_card" class="custom-control-label"> <label :for="'store_card' + _uid" class="custom-control-label">
<strong>{{ textStoreCard }}</strong> <strong>{{ textStoreCard }}</strong>
</label> </label>
</div> </div>
@ -409,6 +409,18 @@ export default {
description: "Placeholder Card Number Text" description: "Placeholder Card Number Text"
}, },
textCard: {
type: String,
default: 'Cards',
description: "Label Card Text"
},
textNewCard: {
type: String,
default: 'New Card',
description: "Label New Card Name Text"
},
textCardName: { textCardName: {
type: String, type: String,
default: 'Card Name', default: 'Card Name',

1
resources/lang/en-GB/general.php
View File

@ -162,6 +162,7 @@ return [
'amount_due' => 'Amount due', 'amount_due' => 'Amount due',
'card' => [ 'card' => [
'cards' => 'Card|Cards',
'name' => 'Name on Card', 'name' => 'Name on Card',
'number' => 'Card Number', 'number' => 'Card Number',
'expiration_date' => 'Expiration Date', 'expiration_date' => 'Expiration Date',

2
resources/views/partials/portal/payment_method/hosted.blade.php
View File

@ -10,6 +10,8 @@
text-year="{{ trans('general.year') }}" text-year="{{ trans('general.year') }}"
text-cvv="{{ trans('general.card.cvv') }}" text-cvv="{{ trans('general.card.cvv') }}"
textButton="{{ trans('general.confirm') }}" textButton="{{ trans('general.confirm') }}"
textCard="{{ trans_choice('general.card.cards', 2) }}"
textNewCard="{{ trans('general.form.add_new', ['field' => trans_choice('general.card.cards', 1)]) }}"
textStoreCard="{{ trans('general.card.save') }} " textStoreCard="{{ trans('general.card.save') }} "
:store-card="{{ !empty($store_card) ? 'true' : 'false' }}" :store-card="{{ !empty($store_card) ? 'true' : 'false' }}"
:cards="{{ !empty($cards) ? json_encode($cards) : json_encode([]) }}" :cards="{{ !empty($cards) ? json_encode($cards) : json_encode([]) }}"