shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
merve karaman
2023-06-19 09:14:12 +03:00
committed by GitHub
parent b374555daf 1d12f1115a
commit 8771f99fda
171 changed files with 6099 additions and 5007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/views/auth/common.js vendored
View File

@ -54,6 +54,8 @@ const login = new Vue({
let type = notify.level;
this.$notify({
verticalAlign: 'bottom',
horizontalAlign: 'left',
message: notify.message,
timeout: 5000,
icon: '',

25
resources/assets/js/views/banking/accounts.js vendored
View File

@ -31,29 +31,4 @@ const app = new Vue({
bulk_action: new BulkAction('accounts'),
}
},
methods: {
onType(event) {
return;
let type = event.target.value;
switch(type) {
case 'credit_card':
this.onCreditCard();
break;
case 'bank':
default:
this.onBank();
break;
}
},
onCreditCard() {
},
onBank() {
},
}
});

2
resources/assets/js/views/common/contacts.js vendored
View File

@ -69,6 +69,8 @@ const app = new Vue({
if (response.data.error) {
this.$notify({
verticalAlign: 'bottom',
horizontalAlign: 'left',
message: response.data.message,
timeout: 0,
icon: 'fas fa-bell',

1
resources/assets/js/views/common/documents.js vendored
View File

@ -621,6 +621,7 @@ const app = new Vue({
onChangeCurrency(currency_code) {
if (this.edit.status && this.edit.currency <= 2) {
this.edit.currency++;
return;
}

2
resources/assets/js/views/modules/apps.js vendored
View File

@ -106,6 +106,8 @@ const app = new Vue({
add_to_cart_promise.then(response => {
if (response.data.success) {
this.$notify({
verticalAlign: 'bottom',
horizontalAlign: 'left',
message: response.data.message,
timeout: 0,
icon: "shopping_cart_checkout",

2
resources/assets/js/views/settings/settings.js vendored
View File

@ -141,7 +141,7 @@ const app = new Vue({
});
},
// Change currency get money
// Change currency get money override because remove form currency_code and currency_rate column
onChangeCurrency(currency_code) {
if (! currency_code) {
return;

10
resources/assets/js/views/wizard/Finish.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="relative bg-body z-10 rounded-lg shadow-2xl p-5 ltr:pr-0 rtl:pl-0 sm:py-10 sm:ltr:pl-10 sm:rtl:pr-10 overflow-hidden">
<div class="relative bg-body z-10 rounded-lg shadow-2xl p-5 sm:p-10 full-height-mobile overflow-hidden">
<WizardSteps :active_state="active"></WizardSteps>
<div class="flex flex-col justify-between -mt-5 sm:mt-0" style="height:565px;">
@ -42,7 +42,7 @@
</div>
</div>
<div class="relative w-1/2 right-0 ltr:pl-10 rtl:pr-10 mt-3 hidden lg:flex lg:flex-col">
<div class="absolute w-1/2 right-0 ltr:pl-10 rtl:pr-10 mt-3 hidden lg:flex lg:flex-col">
<div class="flex flex-col ltr:items-start rtl:items-end bg-purple ltr:rounded-tl-lg ltr:rounded-bl-lg rtl:rounded-tr-lg rtl:rounded-br-lg p-6">
<div class="w-48 text-white text-left text-2xl font-semibold leading-9">
{{ translations.finish.apps_managing }}
@ -50,7 +50,7 @@
<div style="width:372px; height:372px;"></div>
<img :src="image_src" class="absolute top-3 right-2" alt="" />
<img :src="image_src" class="absolute top-3 right-2" alt="Akaunting" />
</div>
<base-button
@ -59,7 +59,7 @@
@click="finish()"
>
<i v-if="anchor_loading" class="animate-submit_second delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-2.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit_second before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit_second before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i>
<span :class="[{'opacity-0': anchor_loading}]">
{{ translations.finish.create_first_invoice }}
</span>
@ -112,6 +112,8 @@ export default {
})
.catch((error) => {
this.$notify({
verticalAlign: 'bottom',
horizontalAlign: 'left',
message: this.translations.finish.error_message,
timeout: 1000,
icon: "",