Merge branch 'master' of github.com:akaunting/akaunting

This commit is contained in:
denisdulici 2020-02-09 12:40:02 +03:00
commit 7804fa0859
74 changed files with 98 additions and 72 deletions

View File

@ -13,6 +13,7 @@ use App\Jobs\Purchase\DeleteBill;
use App\Jobs\Purchase\DuplicateBill;
use App\Jobs\Purchase\UpdateBill;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Common\Item;
use App\Models\Purchase\Bill;
@ -73,6 +74,19 @@ class Bills extends Controller
$date_format = $this->getCompanyDateFormat();
// Get Bill Totals
foreach ($bill->totals as $bill_total) {
$bill->{$bill_total->code} = $bill_total->amount;
}
$total = money($bill->total, $currency->code, true)->format();
$bill->grand_total = money($total, $currency->code)->getAmount();
if (!empty($bill->paid)) {
$bill->grand_total = round($bill->total - $bill->paid, $currency->precision) ;
}
return view('purchases.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
}

View File

@ -13,6 +13,7 @@ use App\Jobs\Sale\DeleteInvoice;
use App\Jobs\Sale\DuplicateInvoice;
use App\Jobs\Sale\UpdateInvoice;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Common\Item;
use App\Models\Sale\Invoice;
@ -77,6 +78,19 @@ class Invoices extends Controller
$date_format = $this->getCompanyDateFormat();
// Get Invoice Totals
foreach ($invoice->totals as $invoice_total) {
$invoice->{$invoice_total->code} = $invoice_total->amount;
}
$total = money($invoice->total, $currency->code, true)->format();
$invoice->grand_total = money($total, $currency->code)->getAmount();
if (!empty($invoice->paid)) {
$invoice->grand_total = round($invoice->total - $invoice->paid, $currency->precision);
}
return view('sales.invoices.show', compact('invoice', 'accounts', 'currencies', 'currency', 'account_currency_code', 'customers', 'categories', 'payment_methods', 'signed_url', 'date_format'));
}

View File

@ -206,7 +206,6 @@ const app = new Vue({
this.transaction_form.paid_at = form.paid_at;
this.transaction_form.account_id = form.account_id;
this.transaction_form.payment_method = form.payment_method;
this.transaction_form.amount = form.amount;
},
addPayment() {

View File

@ -206,7 +206,6 @@ const app = new Vue({
this.transaction_form.paid_at = form.paid_at;
this.transaction_form.account_id = form.account_id;
this.transaction_form.payment_method = form.payment_method;
this.transaction_form.amount = form.amount;
},
addPayment() {

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'إستلام فاتورة',
'make_payment' => 'القيام بالدفع',
'status' => [
'statuses' => [
'draft' => 'مسودة',
'received' => 'مستلم',
'partial' => 'جزئي',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Get Paid',
'accept_payments' => 'Accept Online Payments',
'status' => [
'statuses' => [
'draft' => 'مسودة',
'sent' => 'تم الإرسال',
'viewed' => 'المشاهدات',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Приеми фактура',
'make_payment' => 'Направи плащане',
'status' => [
'statuses' => [
'draft' => 'Неплатен',
'received' => 'Приета',
'partial' => 'Частичен',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Получи плащане',
'accept_payments' => 'Приеми на онлайн плащане',
'status' => [
'statuses' => [
'draft' => 'Неплатен',
'sent' => 'Изпратено',
'viewed' => 'Разгледани',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Příjem faktury',
'make_payment' => 'Platba faktury',
'status' => [
'statuses' => [
'draft' => 'Koncept',
'received' => 'Přijato',
'partial' => 'Částečně',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Uhrazení faktury',
'accept_payments' => 'Přijímat online platby',
'status' => [
'statuses' => [
'draft' => 'Koncept',
'sent' => 'Odesláno',
'viewed' => 'Zobrazeno',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Modtag regning',
'make_payment' => 'Opret betaling',
'status' => [
'statuses' => [
'draft' => 'Kladde',
'received' => 'Modtaget',
'partial' => 'Delvis',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Betal',
'accept_payments' => 'Accepter onlinebetalinger',
'status' => [
'statuses' => [
'draft' => 'Kladde',
'sent' => 'Sendt',
'viewed' => 'Vist',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Παραλαβή Λογαριασμού',
'make_payment' => 'Δημιουργία Πληρωμής',
'status' => [
'statuses' => [
'draft' => 'Προσχέδιο',
'received' => 'Ληφθέντα',
'partial' => 'Μερική',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Λήψη Πληρωμής',
'accept_payments' => 'Δεχτείτε ηλεκτρονικές πληρωμές',
'status' => [
'statuses' => [
'draft' => 'Προσχέδιο',
'sent' => 'Απεσταλμένο',
'viewed' => 'Έχει ανοιχτεί',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Recibir factura',
'make_payment' => 'Pagar',
'status' => [
'statuses' => [
'draft' => 'Borrador',
'received' => 'Recibido',
'partial' => 'Parcial',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Recibir Pago',
'accept_payments' => 'Aceptar Pagos Online',
'status' => [
'statuses' => [
'draft' => 'Borrador',
'sent' => 'Enviado',
'viewed' => 'Visto',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Recibir Recibo',
'make_payment' => 'Hacer Pago',
'status' => [
'statuses' => [
'draft' => 'Borrador',
'received' => 'Recibido',
'partial' => 'Parcial',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Get Paid',
'accept_payments' => 'Accept Online Payments',
'status' => [
'statuses' => [
'draft' => 'Borrador',
'sent' => 'Enviado',
'viewed' => 'Visto',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => 'دانلود PDF',
'send_mail' => 'ارسال ایمیل',
'status' => [
'statuses' => [
'draft' => 'پیش‌ نویس',
'received' => 'دریافت شده',
'partial' => 'جزئیات',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => 'ارسال ایمیل',
'all_invoices' => 'Login to view all invoices',
'status' => [
'statuses' => [
'draft' => 'پیش‌ نویس',
'sent' => 'ارسال شده',
'viewed' => 'مشاهده شده',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => 'Télécharger en PDF',
'send_mail' => 'Envoyer un Email',
'status' => [
'statuses' => [
'draft' => 'Brouillon',
'received' => 'Reçu',
'partial' => 'Partiel',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => 'Envoyer un Email',
'all_invoices' => 'Connectez-vous pour voir toutes les factures',
'status' => [
'statuses' => [
'draft' => 'Brouillon',
'sent' => 'Envoyé',
'viewed' => 'Vu',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => 'הורדת PDF',
'send_mail' => 'שלח דואר אלקטרוני',
'status' => [
'statuses' => [
'draft' => 'טיוטה',
'received' => 'התקבל',
'partial' => 'חלקי',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => 'שלח דואר אלקטרוני',
'all_invoices' => 'Login to view all invoices',
'status' => [
'statuses' => [
'draft' => 'טיוטה',
'sent' => 'נשלח',
'viewed' => 'נצפה',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'बिल प्राप्त करें',
'make_payment' => 'भुगतान करो',
'status' => [
'statuses' => [
'draft' => 'ड्राफ्ट',
'received' => 'स्वीकार किया',
'partial' => 'आंशिक',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'भुगतान प्राप्त करना',
'accept_payments' => 'ऑनलाइन भुगतान स्वीकार करें',
'status' => [
'statuses' => [
'draft' => 'ड्राफ्ट',
'sent' => 'भेजें',
'viewed' => 'देखा गया',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => 'Preuzmite PDF',
'send_mail' => 'Pošalji e-mail',
'status' => [
'statuses' => [
'draft' => 'Skica',
'received' => 'Primljeno',
'partial' => 'Djelomično',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => 'Pošalji e-mail',
'all_invoices' => 'Login to view all invoices',
'status' => [
'statuses' => [
'draft' => 'Skica',
'sent' => 'Poslano',
'viewed' => 'Pogledano',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Menerima Tagihan',
'make_payment' => 'Melakukan Pembayaran',
'status' => [
'statuses' => [
'draft' => 'Konsep',
'received' => 'Diterima',
'partial' => 'Sebagian',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Telah dibayar',
'accept_payments' => 'Menerima pembayaran online',
'status' => [
'statuses' => [
'draft' => 'Konsep',
'sent' => 'Mengirim',
'viewed' => 'Lihat',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Taka á móti reikningi',
'make_payment' => 'Greiða',
'status' => [
'statuses' => [
'draft' => 'Uppkast',
'received' => 'Móttekið',
'partial' => 'Hluta',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Fá greitt',
'accept_payments' => 'Taka á moti netgreiðslu',
'status' => [
'statuses' => [
'draft' => 'Uppkast',
'sent' => 'Sent',
'viewed' => 'Skoðað',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => '請求書を受け取る',
'make_payment' => '支払う',
'status' => [
'statuses' => [
'draft' => '下書き',
'received' => '受け取った',
'partial' => '部分的',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => '支払いを受ける',
'accept_payments' => 'オンラインでの支払いを受け入れる',
'status' => [
'statuses' => [
'draft' => '下書き',
'sent' => '送信',
'viewed' => '閲覧',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'ანგარიშის გაგზავნა',
'make_payment' => 'გადახდის შესრულება',
'status' => [
'statuses' => [
'draft' => 'დრაფტი',
'received' => 'მიღებულია',
'partial' => 'ნაწილობრივი',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'გადახდის მიღება',
'accept_payments' => 'ონლაინ გადახდის მიღება',
'status' => [
'statuses' => [
'draft' => 'პროექტი',
'sent' => 'გაგზავნა',
'viewed' => 'ნახვა',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => '계산서를 받음',
'make_payment' => '지불',
'status' => [
'statuses' => [
'draft' => '초안',
'received' => '수신됨',
'partial' => '부분',

View File

@ -36,7 +36,7 @@ return [
'send_invoice' => '청구서 전송',
'get_paid' => '돈을 받음',
'status' => [
'statuses' => [
'draft' => '초안',
'sent' => '보낸 메시지',
'viewed' => '읽음',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Gauti sąskaitą',
'make_payment' => 'Atlikti mokėjimą',
'status' => [
'statuses' => [
'draft' => 'Juodraštis',
'received' => 'Gauta',
'partial' => 'Dalinis',

View File

@ -36,7 +36,7 @@ return [
'send_invoice' => 'Siųsti sąskaitą-faktūrą',
'get_paid' => 'Gauti apmokėjimą',
'status' => [
'statuses' => [
'draft' => 'Juodraštis',
'sent' => 'Išsiųsta',
'viewed' => 'Peržiūrėta',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Saņemt rēķinu',
'make_payment' => 'Veikt maksājumu',
'status' => [
'statuses' => [
'draft' => 'Melnraksts',
'received' => 'Saņemts',
'partial' => 'Daļējs',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Saņemt apmaksu',
'accept_payments' => 'Pieņemt tiešsaistes maksājumus',
'status' => [
'statuses' => [
'draft' => 'Sagatave',
'sent' => 'Nosūtīts',
'viewed' => 'Skatīts',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => 'Превземи PDF',
'send_mail' => 'Прати е-маил',
'status' => [
'statuses' => [
'draft' => 'Неиспратено',
'received' => 'Примено',
'partial' => 'Некомплетно',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => 'Прати е-маил',
'all_invoices' => 'Login to view all invoices',
'status' => [
'statuses' => [
'draft' => 'Неиспратено',
'sent' => 'Испратена',
'viewed' => 'Прегледано',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Motta faktura',
'make_payment' => 'Opprett betaling',
'status' => [
'statuses' => [
'draft' => 'Utkast',
'received' => 'Mottatt',
'partial' => 'Delvis',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Få betalt',
'accept_payments' => 'Aksepter online betalinger',
'status' => [
'statuses' => [
'draft' => 'Utkast',
'sent' => 'Sendt',
'viewed' => 'Åpnet',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Factuur ontvangen',
'make_payment' => 'Betaling',
'status' => [
'statuses' => [
'draft' => 'Concept',
'received' => 'Ontvangen',
'partial' => 'Gedeeltelijk',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Betaling afstemmen',
'accept_payments' => 'Accept Online Payments',
'status' => [
'statuses' => [
'draft' => 'Concept',
'sent' => 'Verzonden',
'viewed' => 'Bekeken',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Receber Conta',
'make_payment' => 'Fazer Pagamento',
'status' => [
'statuses' => [
'draft' => 'Rascunho',
'received' => 'Recebido',
'partial' => 'Parcial',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Obter Pagamento',
'accept_payments' => 'Aceitar Pagamentos Online',
'status' => [
'statuses' => [
'draft' => 'Rascunho',
'sent' => 'Enviado',
'viewed' => 'Visto',

View File

@ -36,7 +36,7 @@ Nume articol|Nume articole',
'receive_bill' => 'Receive Bill',
'make_payment' => 'Plătește',
'status' => [
'statuses' => [
'draft' => 'Ciornă',
'received' => 'Primit
Primite',

View File

@ -38,7 +38,7 @@ Nume articol|Nume articole',
'get_paid' => 'Get Paid',
'accept_payments' => 'Accept Online Payments',
'status' => [
'statuses' => [
'draft' => 'Ciornă',
'sent' => 'Trimis',
'viewed' => 'Vizualizat',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Получить закупку',
'make_payment' => 'Сделать оплату',
'status' => [
'statuses' => [
'draft' => 'Черновик',
'received' => 'Получено',
'partial' => 'Частично',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Оплачено',
'accept_payments' => 'Принимать онлайн-платежи',
'status' => [
'statuses' => [
'draft' => 'Черновик',
'sent' => 'Отправлено',
'viewed' => 'Просмотрено',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => 'Stiahnuť PDF',
'send_mail' => 'Odoslať e-mail',
'status' => [
'statuses' => [
'draft' => 'Koncept',
'received' => 'Prijaté',
'partial' => 'Čiastočné',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => 'Odoslať e-mail',
'all_invoices' => 'Prihláste sa pre zobrazenie všetkých faktúr',
'status' => [
'statuses' => [
'draft' => 'Koncept',
'sent' => 'Odoslané',
'viewed' => 'Zobrazené',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => 'Преузми ПДФ',
'send_mail' => 'Пошаљи Е-пошту',
'status' => [
'statuses' => [
'draft' => 'Скица',
'received' => 'Примљено',
'partial' => 'Делимично',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => 'Пошаљи е-пошту',
'all_invoices' => 'Улогуј се да би видели све фактуре',
'status' => [
'statuses' => [
'draft' => 'Скица',
'sent' => 'Послато',
'viewed' => 'Погледано',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Mottag faktura',
'make_payment' => 'Gör betalning',
'status' => [
'statuses' => [
'draft' => 'Utkast',
'received' => 'Mottagen',
'partial' => 'Delvis',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Få betalt',
'accept_payments' => 'Acceptera onlinebetalningar',
'status' => [
'statuses' => [
'draft' => 'Utkast',
'sent' => 'Skickat',
'viewed' => 'Visad',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'รับบิล',
'make_payment' => 'ทำการชำระเงิน',
'status' => [
'statuses' => [
'draft' => 'ฉบับร่าง',
'received' => 'ได้รับแล้ว',
'partial' => 'บางส่วน',

View File

@ -36,7 +36,7 @@ return [
'send_invoice' => 'Send Invoice',
'get_paid' => 'Get Paid',
'status' => [
'statuses' => [
'draft' => 'ฉบับร่าง',
'sent' => 'ส่ง',
'viewed' => 'ดูแล้ว',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Отримати рахунок',
'make_payment' => 'Оплатити',
'status' => [
'statuses' => [
'draft' => 'Створено',
'received' => 'Отримано',
'partial' => 'Частково оплачено',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'Отримати Оплату',
'accept_payments' => 'Приймати онлайн-платежі',
'status' => [
'statuses' => [
'draft' => 'Створено',
'sent' => 'Надіслано',
'viewed' => 'Переглянуто',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'بل وصول کریں',
'make_payment' => 'ادائیگی کریں',
'status' => [
'statuses' => [
'draft' => 'ڈرافٹ',
'received' => 'وصول',
'partial' => 'جزوی',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'انوائس حاصل کریں',
'accept_payments' => 'آن لائن ادائیگی قبول کریں',
'status' => [
'statuses' => [
'draft' => 'ڈرافٹ',
'sent' => 'بھیجا گیا ہے:',
'viewed' => 'دیکھا',

View File

@ -35,7 +35,7 @@ return [
'receive_bill' => 'Hisobni oling',
'make_payment' => 'To\'lovni amalga oshiring',
'status' => [
'statuses' => [
'draft' => 'Qoralama',
'received' => 'Qabul qildi',
'partial' => 'Qisman',

View File

@ -37,7 +37,7 @@ return [
'get_paid' => 'To\'lang',
'accept_payments' => 'Onlayn to\'lovlarni qabul qiling',
'status' => [
'statuses' => [
'draft' => 'Qoralama',
'sent' => 'Yuborildi',
'viewed' => 'Ko\'rilgan',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => 'Tải PDF',
'send_mail' => 'Gửi email',
'status' => [
'statuses' => [
'draft' => 'Bản nháp',
'received' => 'Đã nhận',
'partial' => 'Một phần',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => 'Gửi Email',
'all_invoices' => 'Login to view all invoices',
'status' => [
'statuses' => [
'draft' => 'Bản nháp',
'sent' => 'Đã gửi',
'viewed' => 'Đã xem',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => '下载 PDF格式',
'send_mail' => '发送邮件',
'status' => [
'statuses' => [
'draft' => '草稿',
'received' => '已收到',
'partial' => '部分',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => '发送邮件',
'all_invoices' => 'Login to view all invoices',
'status' => [
'statuses' => [
'draft' => '草稿',
'sent' => '已发送',
'viewed' => '已浏览',

View File

@ -32,7 +32,7 @@ return [
'download_pdf' => '下載 PDF格式',
'send_mail' => '傳送電子郵件',
'status' => [
'statuses' => [
'draft' => '草稿',
'received' => '已收到',
'partial' => '部分',

View File

@ -33,7 +33,7 @@ return [
'send_mail' => '傳送電子郵件',
'all_invoices' => '登錄以查看所有發票',
'status' => [
'statuses' => [
'draft' => '草稿',
'sent' => '已傳送',
'viewed' => '已瀏覽',