rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

wallet transaction list operation locale

Browse Source
This commit is contained in:
Peng DU 2016-07-11 16:58:17 +02:00
parent 38fafb7a70
commit 4f42253d3d
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/templates/wallet/transactions.html.erb
View File

@ -13,6 +13,10 @@
<td>{{ t.created_at | amDateFormat:'L' }}</td>
<td>
<span ng-if="t.transaction_type == 'credit'" translate>{{ 'credit' }}</span>
<span ng-if="t.transaction_type == 'debit' && t.transactable_type == 'Subscription'" translate>{{ 'debit_subscription' }}</span>
<span ng-if="t.transaction_type == 'debit' && t.transactable_type == 'Reservation' && t.transactable.reservable_type == 'Training'" translate>{{ 'debit_reservation_training' }}</span>
<span ng-if="t.transaction_type == 'debit' && t.transactable_type == 'Reservation' && t.transactable.reservable_type == 'Machine'" translate>{{ 'debit_reservation_machine' }}</span>
<span ng-if="t.transaction_type == 'debit' && t.transactable_type == 'Reservation' && t.transactable.reservable_type == 'Event'" translate>{{ 'debit_reservation_event' }}</span>
</td>
<td>{{ t.user.full_name }}</td>
<td ng-class="{'green':t.transaction_type == 'credit', 'red':t.transaction_type == 'debit'}">

7
app/views/api/wallet/transactions.json.jbuilder
View File

@ -1,7 +1,12 @@
json.array!(@wallet_transactions) do |t|
json.extract! t, :id, :transaction_type, :created_at, :amount
json.extract! t, :id, :transaction_type, :created_at, :amount, :transactable_type
json.user do
json.id t.user.id
json.full_name t.user.profile.full_name
end
json.transactable do
if t.transactable_type == 'Reservation'
json.reservable_type t.transactable.reservable_type
end
end if t.transactable
end

4
config/locales/app.shared.en.yml
View File

@ -308,3 +308,7 @@ en:
to_credit: 'Credit'
wallet_credit_successfully: "Wallet of user is credited successfully."
a_problem_occurred_for_wallet_credit: "A problem is occurred while taking the credit of wallet"
debit_subscription: "Debit by subscription"
debit_reservation_training: "Debit by reservation of training"
debit_reservation_machine: "Debit by reservation of machine"
debit_reservation_event: "Debit by reservation of event"

4
config/locales/app.shared.fr.yml
View File

@ -313,3 +313,7 @@ fr:
amount_minimum_1: "Le montant minimum est d'1"
you_have_amount_in_wallet: "Vous avez {{amount}} {{currency}} sur votre porte-monnaie"
wallet_pay_reservation: "Vous pouvez effectuer directement votre paiement de réservation"
debit_subscription: "Payer un abonnement"
debit_reservation_training: "Payer un reservation de formation"
debit_reservation_machine: "Payer un reservation de machine"
debit_reservation_event: "Payer un reservation d'évenement"