Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bitcoin amount

Browse Source
This commit is contained in:
Hillel Coren 2017-12-14 13:10:05 +02:00
parent 6960ea19a9
commit e8f118c204
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/PaymentDrivers/StripePaymentDriver.php
View File

@ -408,7 +408,7 @@ class StripePaymentDriver extends BasePaymentDriver
'account' => $this->account(), 'account' => $this->account(),
'invitation' => $this->invitation, 'invitation' => $this->invitation,
'invoiceNumber' => $invoiceNumber, 'invoiceNumber' => $invoiceNumber,
'amount' => $amount, 'amount' => $this->invoice()->getRequestedAmount(),
'source' => $response, 'source' => $response,
]); ]);
} else { } else {

7
resources/views/invoices/view.blade.php
View File

@ -163,7 +163,7 @@
@if ($invoice->isQuote()) @if ($invoice->isQuote())
{!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}   {!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}  
@if ($showApprove) @if ($showApprove)
{!! Button::success(trans('texts.approve'))->asLinkTo(URL::to('/approve/' . $invitation->invitation_key))->large() !!} {!! Button::success(trans('texts.approve'))->withAttributes(['id' => 'approveButton', 'onclick' => 'onApproveClick()'])->large() !!}
@endif @endif
@elseif ( ! $invoice->canBePaid()) @elseif ( ! $invoice->canBePaid())
{!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!} {!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}
@ -289,6 +289,11 @@
$('#authorizationModal').modal('show'); $('#authorizationModal').modal('show');
} }
function onApproveClick() {
$('#approveButton').prop('disabled', true);
//location.href = "{{ url('/approve/' . $invitation->invitation_key) }}";
}
function onDownloadClick() { function onDownloadClick() {
try { try {
var doc = generatePDF(invoice, invoice.invoice_design.javascript, true); var doc = generatePDF(invoice, invoice.invoice_design.javascript, true);