Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev
# Conflicts: # app/Http/Controllers/Common/Items.php # resources/views/modules/item/documentation.blade.php # resources/views/modules/item/show.blade.php # resources/views/partials/admin/header.blade.php # resources/views/purchases/bills/show.blade.php # resources/views/purchases/vendors/show.blade.php # resources/views/sales/customers/show.blade.php # resources/views/sales/invoices/show.blade.php # resources/views/wizard/companies/edit.blade.php # resources/views/wizard/currencies/index.blade.php # resources/views/wizard/finish/index.blade.php # resources/views/wizard/taxes/index.blade.php
This commit is contained in:
.github/workflows
.gitignore.htaccessapp
Abstracts
BulkActions
Banking
Console
Commands
BillReminder.phpFinishUpdate.phpInstall.phpInstallRefresh.phpInvoiceReminder.phpRecurringCheck.phpUninstallModule.phpUpdateAll.php
Stubs
Modules
Events
Auth
Install
Module
Report
Sale
Exports
Http
Controllers
Api
Auth
Banking
Common
Purchases
Sales
Settings
Auth
Banking
Common
Install
Modals
Accounts.phpBillTransactions.phpCategories.phpCurrencies.phpCustomers.phpInvoiceTemplates.phpInvoiceTransactions.phpItems.phpTaxes.phpVendors.php
Modules
Portal
Purchases
Sales
Settings
Company.phpCurrencies.phpDefaults.phpEmail.phpInvoice.phpLocalisation.phpModules.phpSchedule.phpTaxes.php
Wizard
Middleware
Requests
Purchase
ViewComposers
Jobs
Auth
CreatePermission.phpCreateRole.phpCreateUser.phpDeletePermission.phpDeleteRole.phpDeleteUser.phpUpdatePermission.phpUpdateRole.phpUpdateUser.php
Banking
CreateAccount.phpCreateDocumentTransaction.phpCreateReconciliation.phpCreateTransaction.phpCreateTransfer.phpDeleteAccount.phpDeleteReconciliation.phpDeleteTransaction.phpDeleteTransfer.phpUpdateAccount.phpUpdateReconciliation.phpUpdateTransaction.phpUpdateTransfer.php
Common
CreateCompany.phpCreateContact.phpCreateDashboard.phpCreateItem.phpCreateReport.phpDeleteCompany.phpDeleteContact.phpDeleteDashboard.phpDeleteItem.phpDeleteReport.phpUpdateCompany.phpUpdateContact.phpUpdateDashboard.phpUpdateItem.phpUpdateReport.php
Purchase
CancelBill.phpCreateBill.phpCreateBillItem.phpCreateBillItemsAndTotals.phpDeleteBill.phpDuplicateBill.phpUpdateBill.php
Sale
CancelInvoice.phpCreateInvoice.phpCreateInvoiceItem.phpCreateInvoiceItemsAndTotals.phpDeleteInvoice.phpDuplicateInvoice.phpUpdateInvoice.php
Setting
Listeners
Auth
Menu
Module
Update
Models
Auth
Banking
Common
Module
Setting
Notifications
Providers
Reports
Traits
Utilities
Widgets
bootstrap
composer.jsoncomposer.lockconfig
database
factories
migrations
seeds
modules
OfflinePayments
PaypalStandard
overrides
akaunting
symfony
process
public/css
resources
assets
js
lang
ar-SA
bg-BG
bn-BD
accounts.phpauth.phpbills.phpbulk_actions.phpdemo.phpemail_templates.phperrors.phpfooter.phpgeneral.phpheader.phpimport.phpinstall.phpmodules.phptaxes.php
cs-CZ
da-DK
accounts.phpauth.phpbills.phpdemo.phpemail_templates.phpgeneral.phpinstall.phpmessages.phpmodules.phpreconciliations.phpsettings.phptaxes.phpwidgets.php
de-DE
el-GR
auth.phpbills.phpbulk_actions.phpcompanies.phpcustomers.phpmaintenance.phpmodules.phppagination.phppasswords.phpreports.phpsettings.phptaxes.phpvalidation.php
en-GB
en-US
es-AR
accounts.phpauth.phpbills.phpbulk_actions.phpcompanies.phpcurrencies.phpcustomers.phpdashboards.phpdemo.phpemail_templates.phperrors.phpfooter.phpgeneral.phpheader.phpimport.phpinstall.phpinvoices.phpitems.phpmaintenance.phpmessages.phpmodules.phpnotifications.phppagination.phppasswords.phpreconciliations.phprecurring.phpreports.phpsettings.phptaxes.phptransfers.phpupdates.phpvalidation.phpwidgets.php
es-CO
es-ES
es-MX
et-EE
accounts.phpauth.phpbills.phpbulk_actions.phpcompanies.phpcurrencies.phpcustomers.phpfooter.phpimport.phpitems.phprecurring.phptransfers.php
fi-FI
fr-FR
auth.phpbills.phpbulk_actions.phpcompanies.phpcustomers.phpdashboard.phpdashboards.phpdemo.phpemail_templates.phperrors.phpgeneral.phpheader.phpinstall.phpinvoices.phpitems.phpmaintenance.phpmessages.phpmodules.phppagination.phppasswords.phpreconciliations.phpreports.phpsettings.phptaxes.phpvalidation.phpwidgets.php
he-IL
hi-IN
hr-HR
hu-HU
accounts.phpcurrencies.phperrors.phpfooter.phpimport.phpitems.phpnotifications.phprecurring.phptransfers.phpupdates.phpwidgets.php
id-ID
is-IS
auth.phpbills.phpbulk_actions.phpcompanies.phpcustomers.phpdashboard.phpdashboards.phpdemo.phpemail_templates.phperrors.phpgeneral.phpinstall.phpinvoices.phpmaintenance.phpmessages.phpmodules.phppagination.phppasswords.phpreconciliations.phpreports.phpsettings.phptaxes.phpvalidation.phpwidgets.php
it-IT
ja-JP
ka-GE
auth.phpcompanies.phpcustomers.phpdemo.phpemail_templates.phpheader.phpitems.phpmaintenance.phppagination.phpvalidation.php
ko-KR
lt-LT
mk-MK
ms-MY
nb-NO
ne-NP
accounts.phpauth.phpbills.phpbulk_actions.phpcompanies.phpcurrencies.phpcustomers.phpdashboards.phpdemo.phpemail_templates.phperrors.phpfooter.phpgeneral.phpheader.phpimport.phpinstall.phpinvoices.phpitems.phpmaintenance.phpmessages.phpmodules.phpnotifications.phppagination.phppasswords.phpreconciliations.phprecurring.phpreports.phpsettings.phptaxes.phptransfers.phpupdates.phpvalidation.phpwidgets.php
nl-NL
bills.phpbulk_actions.phpemail_templates.phperrors.phpgeneral.phpinstall.phpinvoices.phpmaintenance.phpmessages.phpmodules.phppagination.phppasswords.phpreconciliations.phpreports.phpsettings.phptaxes.phpvalidation.phpwidgets.php
pl-PL
accounts.phpcurrencies.phpcustomers.phpfooter.phpheader.phpitems.phpmaintenance.phpnotifications.phptransfers.phpupdates.php
pt-BR
pt-PT
auth.phpbills.phpbulk_actions.phpcompanies.phpcustomers.phpemail_templates.phperrors.phpgeneral.phpimport.phpinstall.phpinvoices.phpmaintenance.phpmessages.phpmodules.phpnotifications.phppagination.phppasswords.phpreconciliations.phpsettings.phptaxes.phpvalidation.phpwidgets.php
ro-RO
ru-RU
sk-SK
sl-SI
accounts.phpcurrencies.phpfooter.phpimport.phpitems.phpnotifications.phprecurring.phptransfers.phpupdates.php
sq-AL
sr-CS
accounts.phpauth.phpbills.phpcompanies.phpcurrencies.phpcustomers.phpdashboards.phpdemo.phperrors.phpfooter.phpimport.phpitems.phppagination.phptransfers.phpupdates.phpwidgets.php
sr-SP
accounts.phpauth.phpbills.phpcurrencies.phpfooter.phpheader.phpimport.phpitems.phpnotifications.phprecurring.phptransfers.phpupdates.php
sv-SE
th-TH
tr-TR
uk-UA
ur-PK
uz-UZ
auth.phpcompanies.phpcustomers.phpdashboards.phpdemo.phperrors.phpmaintenance.phpmodules.phppagination.phpreports.phpwidgets.php
vi-VN
zh-CN
bills.phpbulk_actions.phpinstall.phpinvoices.phpmessages.phpmodules.phppasswords.phpsettings.phpvalidation.php
zh-TW
auth.phpbills.phpbulk_actions.phpcompanies.phpcustomers.phpdashboards.phpdemo.phpemail_templates.phperrors.phpgeneral.phpheader.phpinstall.phpinvoices.phpitems.phpmaintenance.phpmessages.phpmodules.phppagination.phppasswords.phpreconciliations.phpreports.phpsettings.phptaxes.phpvalidation.phpwidgets.php
views
auth
banking
accounts
reconciliations
transactions
transfers
common
reports
install
updates
layouts
modals
accounts
bills
invoices
settings
modules
partials
admin
content.blade.phphead.blade.phpheader.blade.phpnavbar.blade.phppagination.blade.phpsuggestions.blade.php
auth
form
checkbox_group.blade.phpdate_group.blade.phpdate_time_group.blade.phpinvoice_text.blade.phpmoney_group.blade.phpmulti_select_add_new_group.blade.phpmulti_select_group.blade.phpmulti_select_remote_group.blade.phpselect_add_new_group.blade.phpselect_group.blade.phpselect_group_add_new_group.blade.phpselect_group_group.blade.phpselect_remote_group.blade.phptext_editor_group.blade.phptime_group.blade.php
media
modules
portal
print
reports
signed
widgets
wizard
portal
invoices
purchases
reports
profit_loss
tax_summary
sales
customers
invoices
revenues
settings
company
currencies
default
email
invoice
localisation
modules
schedule
widgets
wizard
routes
tests/Feature
@ -22,6 +22,7 @@
|
||||
</div>
|
||||
<div class="modal-body pb-0" v-else>
|
||||
<form id="form-create" method="POST" action="#"/>
|
||||
|
||||
<component v-bind:is="component"></component>
|
||||
</div>
|
||||
</slot>
|
||||
@ -33,7 +34,11 @@
|
||||
{{ buttons.cancel.text }}
|
||||
</button>
|
||||
|
||||
<button :disabled="form.loading" type="button" class="btn button-submit" :class="buttons.confirm.class" @click="onSubmit">
|
||||
<a v-if="buttons.payment" :href="buttons.payment.url" class="btn btn-white" :class="buttons.payment.class">
|
||||
{{ buttons.payment.text }}
|
||||
</a>
|
||||
|
||||
<button :disabled="form.loading" type="button" class="btn button-submit" :class="buttons.confirm.class" @click="onSubmit">
|
||||
<div class="aka-loader"></div><span>{{ buttons.confirm.text }}</span>
|
||||
</button>
|
||||
</div>
|
||||
@ -139,10 +144,12 @@ export default {
|
||||
},
|
||||
|
||||
mounted() {
|
||||
let form_prefix = this._uid;
|
||||
|
||||
if (this.is_component) {
|
||||
this.component = Vue.component('add-new-component', (resolve, reject) => {
|
||||
resolve({
|
||||
template : '<div id="modal-add-new-form">' + this.message + '</div>',
|
||||
template : '<div id="modal-add-new-form-' + form_prefix + '">' + this.message + '</div>',
|
||||
|
||||
components: {
|
||||
AkauntingRadioGroup,
|
||||
@ -159,7 +166,7 @@ export default {
|
||||
},
|
||||
|
||||
mounted() {
|
||||
let form_id = document.getElementById('modal-add-new-form').children[0].id;
|
||||
let form_id = document.getElementById('modal-add-new-form-' + form_prefix).children[0].id;
|
||||
|
||||
this.form = new Form(form_id);
|
||||
},
|
||||
@ -217,7 +224,24 @@ export default {
|
||||
})
|
||||
.catch(error => {
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
// Change bank account get money and currency rate
|
||||
async onChangePaymentAccount(account_id) {
|
||||
let payment_account = Promise.resolve(window.axios.get(url + '/banking/accounts/currency', {
|
||||
params: {
|
||||
account_id: account_id
|
||||
}
|
||||
}));
|
||||
|
||||
payment_account.then(response => {
|
||||
this.form.currency = response.data.currency_name;
|
||||
this.form.currency_code = response.data.currency_code;
|
||||
this.form.currency_rate = response.data.currency_rate;
|
||||
})
|
||||
.catch(error => {
|
||||
});
|
||||
},
|
||||
}
|
||||
})
|
||||
});
|
||||
|
Reference in New Issue
Block a user