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

avoir by wallet

Browse Source
This commit is contained in:
Peng DU 2016-07-12 11:39:18 +02:00
parent 4f42253d3d
commit 2c49285740
7 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/controllers/admin/invoices.coffee.erb
View File

@ -494,6 +494,7 @@ Application.Controllers.controller 'AvoirModalController', ["$scope", "$uibModal
{name: _t('by_cash'), value: 'cash'} {name: _t('by_cash'), value: 'cash'}
{name: _t('by_cheque'), value: 'cheque'} {name: _t('by_cheque'), value: 'cheque'}
{name: _t('by_transfer'), value: 'transfer'} {name: _t('by_transfer'), value: 'transfer'}
{name: _t('by_wallet'), value: 'wallet'}
] ]
## If a subscription was took with the current invoice, should it be canceled or not ## If a subscription was took with the current invoice, should it be canceled or not

2
app/models/avoir.rb
View File

@ -2,7 +2,7 @@ class Avoir < Invoice
belongs_to :invoice belongs_to :invoice
after_create :expire_subscription, if: :subscription_to_expire after_create :expire_subscription, if: :subscription_to_expire
validates :avoir_mode, :inclusion => {:in => %w(stripe cheque transfer none cash)} validates :avoir_mode, :inclusion => {:in => %w(stripe cheque transfer none cash wallet)}
attr_accessor :invoice_items_ids attr_accessor :invoice_items_ids

2
app/pdfs/pdf/invoice.rb
View File

@ -196,6 +196,8 @@ module PDF
payment_verbose += I18n.t('invoices.by_transfer') payment_verbose += I18n.t('invoices.by_transfer')
when 'cash' when 'cash'
payment_verbose += I18n.t('invoices.by_cash') payment_verbose += I18n.t('invoices.by_cash')
when 'wallet'
payment_verbose += I18n.t('invoices.by_wallet')
when 'none' when 'none'
payment_verbose = I18n.t('invoices.no_refund') payment_verbose = I18n.t('invoices.no_refund')
else else

1
config/locales/app.admin.en.yml
View File

@ -246,6 +246,7 @@ en:
by_cash: "By cash" by_cash: "By cash"
by_cheque: "By cheque" by_cheque: "By cheque"
by_transfer: "By transfer" by_transfer: "By transfer"
by_wallet: "By wallet"
you_must_select_at_least_one_element_to_create_a_refund: "You must select at least one element, to create a refund." you_must_select_at_least_one_element_to_create_a_refund: "You must select at least one element, to create a refund."
unable_to_create_the_refund: "Unable to create the refund" unable_to_create_the_refund: "Unable to create the refund"
invoice_reference_successfully_saved: "Invoice reference successfully saved." invoice_reference_successfully_saved: "Invoice reference successfully saved."

1
config/locales/app.admin.fr.yml
View File

@ -246,6 +246,7 @@ fr:
by_cash: "En espèces" by_cash: "En espèces"
by_cheque: "Par chèque" by_cheque: "Par chèque"
by_transfer: "Par virement" by_transfer: "Par virement"
by_wallet: "Par porte-monnaie"
you_must_select_at_least_one_element_to_create_a_refund: "Vous devez sélectionner au moins un élément sur lequel créer un avoir." you_must_select_at_least_one_element_to_create_a_refund: "Vous devez sélectionner au moins un élément sur lequel créer un avoir."
unable_to_create_the_refund: "Impossible de créer l'avoir" unable_to_create_the_refund: "Impossible de créer l'avoir"
invoice_reference_successfully_saved: "La référence facture a bien été enregistrée." invoice_reference_successfully_saved: "La référence facture a bien été enregistrée."

1
config/locales/en.yml
View File

@ -97,6 +97,7 @@ en:
by_transfer: "by transfer" by_transfer: "by transfer"
by_cash: "by cash" by_cash: "by cash"
no_refund: "No refund" no_refund: "No refund"
by_wallet: "by wallet"
settlement_by_debit_card: "Settlement by debit card" settlement_by_debit_card: "Settlement by debit card"
settlement_done_at_the_reception: "Settlement done at the reception" settlement_done_at_the_reception: "Settlement done at the reception"
on_DATE_at_TIME: "on %{DATE} at %{TIME}," on_DATE_at_TIME: "on %{DATE} at %{TIME},"

1
config/locales/fr.yml
View File

@ -96,6 +96,7 @@ fr:
by_cheque: "par chèque" by_cheque: "par chèque"
by_transfer: "par virement" by_transfer: "par virement"
by_cash: "en espèces" by_cash: "en espèces"
by_wallet: "par porte-monnaie"
no_refund: "Pas de remboursement" no_refund: "Pas de remboursement"
settlement_by_debit_card: "Règlement effectué par carte bancaire" settlement_by_debit_card: "Règlement effectué par carte bancaire"
settlement_done_at_the_reception: "Règlement effectué à l'accueil" settlement_done_at_the_reception: "Règlement effectué à l'accueil"