mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-26 20:54:21 +01:00
edit invoice reference
This commit is contained in:
parent
2c49285740
commit
773c1adf4a
@ -133,6 +133,8 @@ Application.Controllers.controller "InvoicesController", ["$scope", "$state", 'I
|
|||||||
sample = sample.replace(/X\[([^\]]+)\]/g, (match, p1, offset, string) ->
|
sample = sample.replace(/X\[([^\]]+)\]/g, (match, p1, offset, string) ->
|
||||||
p1
|
p1
|
||||||
)
|
)
|
||||||
|
# information about wallet (W[text]) - does not apply here
|
||||||
|
sample = sample.replace(/W\[([^\]]+)\]/g, "")
|
||||||
# information about refunds (R[text]) - does not apply here
|
# information about refunds (R[text]) - does not apply here
|
||||||
sample = sample.replace(/R\[([^\]]+)\]/g, "")
|
sample = sample.replace(/R\[([^\]]+)\]/g, "")
|
||||||
sample
|
sample
|
||||||
|
@ -210,6 +210,7 @@
|
|||||||
<li ng-click="invoice.reference.help = 'addDay.html'">{{ 'day' | translate }}</li>
|
<li ng-click="invoice.reference.help = 'addDay.html'">{{ 'day' | translate }}</li>
|
||||||
<li ng-click="invoice.reference.help = 'addInvoiceNumber.html'">{{ '#_of_invoice' | translate }}</li>
|
<li ng-click="invoice.reference.help = 'addInvoiceNumber.html'">{{ '#_of_invoice' | translate }}</li>
|
||||||
<li ng-click="invoice.reference.help = 'addOnlineInfo.html'">{{ 'online_sales' | translate }}</li>
|
<li ng-click="invoice.reference.help = 'addOnlineInfo.html'">{{ 'online_sales' | translate }}</li>
|
||||||
|
<li ng-click="invoice.reference.help = 'addWalletInfo.html'">{{ 'wallet' | translate }}</li>
|
||||||
<li ng-click="invoice.reference.help = 'addRefundInfo.html'">{{ 'refund' | translate }}</li>
|
<li ng-click="invoice.reference.help = 'addRefundInfo.html'">{{ 'refund' | translate }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@ -279,6 +280,12 @@
|
|||||||
</table>
|
</table>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<script type="text/ng-template" id="addWalletInfo.html">
|
||||||
|
<table class="invoice-element-legend">
|
||||||
|
<tr><td><strong>W[texte]</strong></td><td>{{ 'add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned' | translate }} <mark translate>{{ 'this_will_never_be_added_when_a_refund_notice_is_present' }}</mark> {{ '(eg_W[/PM]_will_add_/PM_to_the_invoices_settled_with_wallet)' | translate }}</td></tr>
|
||||||
|
</table>
|
||||||
|
</script>
|
||||||
|
|
||||||
<script type="text/ng-template" id="addRefundInfo.html">
|
<script type="text/ng-template" id="addRefundInfo.html">
|
||||||
<table class="invoice-element-legend">
|
<table class="invoice-element-legend">
|
||||||
<tr><td><strong>R[texte]</strong></td><td>{{ 'add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned' | translate }}<mark translate>{{ 'this_will_never_be_added_when_an_online_sales_notice_is_present' }}</mark> {{ '(eg_R[/A]_will_add_/A_to_the_refund_invoices)' | translate }}</td></tr>
|
<tr><td><strong>R[texte]</strong></td><td>{{ 'add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned' | translate }}<mark translate>{{ 'this_will_never_be_added_when_an_online_sales_notice_is_present' }}</mark> {{ '(eg_R[/A]_will_add_/A_to_the_refund_invoices)' | translate }}</td></tr>
|
||||||
|
@ -66,6 +66,9 @@ class Invoice < ActiveRecord::Base
|
|||||||
reference.gsub!(/X\[([^\]]+)\]/, ''.to_s)
|
reference.gsub!(/X\[([^\]]+)\]/, ''.to_s)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# information about wallet (W[text])
|
||||||
|
reference.gsub!(/W\[([^\]]+)\]/, ''.to_s)
|
||||||
|
|
||||||
# remove information about refunds (R[text])
|
# remove information about refunds (R[text])
|
||||||
reference.gsub!(/R\[([^\]]+)\]/, ''.to_s)
|
reference.gsub!(/R\[([^\]]+)\]/, ''.to_s)
|
||||||
|
|
||||||
|
@ -201,6 +201,7 @@ en:
|
|||||||
day: "Day"
|
day: "Day"
|
||||||
"#_of_invoice": "# of invoice"
|
"#_of_invoice": "# of invoice"
|
||||||
online_sales: "Online sales"
|
online_sales: "Online sales"
|
||||||
|
wallet: "Wallet"
|
||||||
refund: "Refund"
|
refund: "Refund"
|
||||||
documentation: "Documentation"
|
documentation: "Documentation"
|
||||||
2_digits_year_(eg_70): "2 digits year (eg. 70)"
|
2_digits_year_(eg_70): "2 digits year (eg. 70)"
|
||||||
@ -224,6 +225,8 @@ en:
|
|||||||
add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Add a notice regarding refunds, only if the invoice is concerned."
|
add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Add a notice regarding refunds, only if the invoice is concerned."
|
||||||
this_will_never_be_added_when_an_online_sales_notice_is_present: "This will never be added when an online sales notice is present."
|
this_will_never_be_added_when_an_online_sales_notice_is_present: "This will never be added when an online sales notice is present."
|
||||||
(eg_R[/A]_will_add_/A_to_the_refund_invoices): '(ed. R[/A] will add "/A" to the refund invoices)'
|
(eg_R[/A]_will_add_/A_to_the_refund_invoices): '(ed. R[/A] will add "/A" to the refund invoices)'
|
||||||
|
add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned: "Add a notice regarding the wallet, only if the invoice is concerned."
|
||||||
|
(eg_W[/PM]_will_add_/PM_to_the_invoices_settled_with_wallet): '(eg. W[/PM] will add "/PM" to the invoices settled with wallet)'
|
||||||
code: "Code"
|
code: "Code"
|
||||||
enable_the_code: "Enable the code"
|
enable_the_code: "Enable the code"
|
||||||
enabled: "Enabled"
|
enabled: "Enabled"
|
||||||
|
@ -201,6 +201,7 @@ fr:
|
|||||||
day: "Jour"
|
day: "Jour"
|
||||||
"#_of_invoice": "N° de facture"
|
"#_of_invoice": "N° de facture"
|
||||||
online_sales: "Vente en ligne"
|
online_sales: "Vente en ligne"
|
||||||
|
wallet: "Porte-monnaie"
|
||||||
refund: "Remboursement"
|
refund: "Remboursement"
|
||||||
documentation: "Documentation"
|
documentation: "Documentation"
|
||||||
2_digits_year_(eg_70): "Année sur 2 chiffres (ex. 70)"
|
2_digits_year_(eg_70): "Année sur 2 chiffres (ex. 70)"
|
||||||
@ -224,6 +225,8 @@ fr:
|
|||||||
add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Ajoute une information relative aux remboursements, uniquement si cela concerne la facture. "
|
add_a_notice_regarding_refunds_only_if_the_invoice_is_concerned: "Ajoute une information relative aux remboursements, uniquement si cela concerne la facture. "
|
||||||
this_will_never_be_added_when_an_online_sales_notice_is_present: "Ceci ne sera jamais cumulé avec une information de vente en ligne."
|
this_will_never_be_added_when_an_online_sales_notice_is_present: "Ceci ne sera jamais cumulé avec une information de vente en ligne."
|
||||||
(eg_R[/A]_will_add_/A_to_the_refund_invoices): '(ex. R[/A] ajoutera "/A" aux factures de remboursement)'
|
(eg_R[/A]_will_add_/A_to_the_refund_invoices): '(ex. R[/A] ajoutera "/A" aux factures de remboursement)'
|
||||||
|
add_a_notice_regarding_the_wallet_only_if_the_invoice_is_concerned: "Ajoute une information relative à le porte-monnaie, uniquement si cela concerne la facture."
|
||||||
|
(eg_W[/PM]_will_add_/PM_to_the_invoices_settled_with_wallet): '(ex. W[/PM] ajoutera "/PM" aux factures réglées avec porte-monnaie)'
|
||||||
code: "Code"
|
code: "Code"
|
||||||
enable_the_code: "Activer le code"
|
enable_the_code: "Activer le code"
|
||||||
enabled: "Activé"
|
enabled: "Activé"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user