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

Removed icons from buttons

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-04-22 12:48:51 +03:00
parent a884e06b72
commit 5ed4cd2da9
142 changed files with 780 additions and 1414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/assets/js/components/AkauntingModal.vue
View File

@@ -23,11 +23,9 @@
<div class="card-footer border-top-0 pt-0">
<slot name="card-footer">
<div class="float-right">
<button type="button" class="btn btn-outline-secondary" @click="onCancel">
{{ button_cancel }}
</button>
<button type="button" class="btn btn-outline-secondary" @click="onCancel">{{ button_cancel }}</button>
<button :disabled="form.loading" type="button" class="btn btn-danger button-submit" @click="onConfirm">
<button :disabled="form.loading" type="button" class="btn btn-danger" @click="onConfirm">
<div class="aka-loader"></div><span>{{ button_delete }}</span>
</button>
</div>
@@ -98,14 +96,6 @@ export default {
};
},
created: function () {
if (this.show) {
let documentClasses = document.body.classList;
documentClasses.add("modal-open");
}
},
methods: {
closeModal() {
this.$emit("update:show", false);
@@ -119,10 +109,6 @@ export default {
},
onCancel() {
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
this.$emit("cancel");
}
},

10
resources/assets/js/components/AkauntingModalAddNew.vue
View File

@@ -130,12 +130,6 @@ export default {
};
},
created: function () {
let documentClasses = document.body.classList;
documentClasses.add("modal-open");
},
mounted() {
if (this.is_component) {
this.component = Vue.component('add-new-component', (resolve, reject) => {
@@ -236,10 +230,6 @@ export default {
},
onCancel() {
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
this.$emit("cancel");
}
},

70
resources/assets/js/components/AkauntingRecurring.vue
View File

@@ -21,23 +21,22 @@
</base-input>
<base-input :label="''"
name="recurring_interval"
type="number"
:value="0"
class="recurring-single"
:class="invertalClasses"
:error="intervalError"
v-model="recurring_interval"
@input="change"
>
name="recurring_interval"
type="number"
:value="0"
class="recurring-single"
:class="invertalClasses"
:error="intervalError"
v-model="recurring_interval"
>
</base-input>
<base-input :label="''"
name="recurring_custom_frequency"
class="recurring-single"
:class="customFrequencyClasses"
:error="customFrequencyError"
>
name="recurring_custom_frequency"
class="recurring-single"
:class="customFrequencyClasses"
:error="customFrequencyError"
>
<el-select v-model="recurring_custom_frequency" @input="change" filterable
:placeholder="placeholder">
<el-option v-for="(label, value) in customFrequencyOptions"
@@ -49,14 +48,14 @@
</base-input>
<base-input :label="''"
name="recurring_count"
type="number"
class="recurring-single"
:class="countClasses"
:error="countError"
v-model="recurring_count"
@input="change"
>
name="recurring_count"
type="number"
:value="0"
class="recurring-single"
:class="countClasses"
:error="countError"
v-model="recurring_count"
>
</base-input>
</div>
</template>
@@ -90,22 +89,14 @@ export default {
frequencyValue: null,
frequencyError: null,
intervalValue: {
type: [Number, String],
default: 0,
description: "Default interval value"
},
intervalValue: null,
intervalError: null,
customFrequencyOptions: null,
customFrequencyValue: null,
customFrequencyError: null,
countValue: {
type: [Number, String],
default: 0,
description: "Default count value"
},
countValue: null,
countError: null,
icon: {
@@ -116,10 +107,10 @@ export default {
data() {
return {
recurring_frequency: null,
recurring_interval: null,
recurring_custom_frequency: null,
recurring_count: null,
recurring_frequency: this.frequencyValue,
recurring_interval: this.intervalValue,
recurring_custom_frequency: this.customFrequencyValue,
recurring_count: this.countValue,
frequencyClasses: 'col-md-12',
invertalClasses: 'col-md-2 d-none',
customFrequencyClasses: 'col-md-4 d-none',
@@ -127,13 +118,6 @@ export default {
}
},
created() {
this.recurring_frequency = this.frequencyValue;
this.recurring_interval = this.intervalValue;
this.recurring_custom_frequency = this.customFrequencyValue;
this.recurring_count = this.countValue;
},
mounted() {
this.recurring_frequency = this.frequencyValue;

1071
resources/assets/js/components/AkauntingSelect.vue
View File

File diff suppressed because it is too large Load Diff

10
resources/assets/js/components/AkauntingWidget.vue
View File

@@ -78,12 +78,12 @@
<div class="col-md-12">
<div class="float-right">
<button type="button" class="btn btn-icon btn-outline-secondary" @click="onCancel">
<span class="btn-inner--text">{{ text.cancel }}</span>
{{ text.cancel }}
</button>
<button :disabled="form.loading" type="button" class="btn btn-icon btn-success button-submit" @click="onSave">
<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div>
<span v-if="!form.loading" class="btn-inner--text">{{ text.save }}</span>
<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span>
<span :class="[{'ml-0': form.loading}]" class="btn-inner--text">{{ text.save }}</span>
</button>
</div>
</div>
@@ -255,10 +255,6 @@ export default {
},
onCancel() {
let documentClasses = document.body.classList;
documentClasses.remove("modal-open");
this.display = false;
this.form.name = '';
this.form.enabled = 1;

6
resources/assets/js/components/CreditCard/CardForm.vue
View File

@@ -113,7 +113,6 @@
</div>
<button class="btn btn-icon btn-success" v-on:click="invaildCard">
<span class="btn-inner--icon"><i class="fas fa-check"></i></span>
<span class="btn-inner--text">{{ textButton }}</span>
</button>
</div>
@@ -263,9 +262,6 @@
<div v-if="loading" class="aka-loader-frame">
<div class="aka-loader"></div>
</div>
<span v-if="!loading" class="btn-inner--icon">
<i class="fas fa-check"></i>
</span>
<span v-if="!loading" class="btn-inner--text">{{ textButton }}</span>
</button>
</div>
@@ -508,8 +504,6 @@ export default {
invaildCard() {
this.loading = true;
this.unMaskCardNumber();
let number = this.formData.cardNumber;
let sum = 0;
let isOdd = true;

3
resources/assets/js/views/install/Database.vue
View File

@@ -84,9 +84,6 @@
<span v-if="!form.loading" class="btn-inner--text">
Next &nbsp;
</span>
<span v-if="!form.loading" class="btn-inner--icon">
<i class="fas fa-arrow-right"></i>
</span>
</button>
</div>
</div>

3
resources/assets/js/views/install/Language.vue
View File

@@ -32,9 +32,6 @@
<span v-if="!form.loading" class="btn-inner--text">
Next &nbsp;
</span>
<span v-if="!form.loading" class="btn-inner--icon">
<i class="fas fa-arrow-right"></i>
</span>
</button>
</div>
</div>

3
resources/assets/js/views/install/Requirements.vue
View File

@@ -26,9 +26,6 @@
<span class="btn-inner--text">
Refresh &nbsp;
</span>
<span class="btn-inner--icon">
<i class="fas fa-sync"></i>
</span>
</button>
</div>
</div>

3
resources/assets/js/views/install/Settings.vue
View File

@@ -82,9 +82,6 @@
<span v-if="!form.loading" class="btn-inner--text">
Next &nbsp;
</span>
<span v-if="!form.loading" class="btn-inner--icon">
<i class="fas fa-arrow-right"></i>
</span>
</button>
</div>
</div>

29
resources/assets/js/views/purchases/bills.js vendored
View File

@@ -69,9 +69,7 @@ const app = new Vue({
if (typeof bill_items !== 'undefined' && bill_items) {
let items = [];
let item_backup = this.form.item_backup[0];
let currency_code = this.form.currency_code;
this.edit.status = true;
bill_items.forEach(function(item) {
@@ -121,18 +119,18 @@ const app = new Vue({
onCalculateTotal() {
let sub_total = 0;
let discount_total = 0;
let line_item_discount_total = 0;
let item_discount_total = 0;
let tax_total = 0;
let grand_total = 0;
let items = this.form.items;
let discount_in_totals = this.form.discount;
let discount = '';
if (items.length) {
let index = 0;
// get all items.
for (index = 0; index < items.length; index++) {
let discount = 0;
// get row item and set item variable.
let item = items[index];
@@ -140,15 +138,6 @@ const app = new Vue({
let item_total = item.price * item.quantity;
// item discount calculate.
let line_discount_amount = 0;
if (item.discount) {
line_discount_amount = item_total * (item.discount / 100);
item_discounted_total = item_total -= line_discount_amount;
discount = item.discount;
}
let item_discounted_total = item_total;
if (discount_in_totals) {
@@ -156,6 +145,14 @@ const app = new Vue({
discount = discount_in_totals;
}
let discount_amount = 0;
if (item.discount) {
discount_amount = item_total * (item.discount / 100);
item_discounted_total = item_total - discount_amount;
discount = item.discount;
}
// item tax calculate.
let item_tax_total = 0;
@@ -223,7 +220,7 @@ const app = new Vue({
}
// calculate sub, tax, discount all items.
line_item_discount_total += line_discount_amount;
item_discount_total += discount_amount;
sub_total += item_total;
tax_total += item_tax_total;
}
@@ -232,7 +229,9 @@ const app = new Vue({
// set global total variable.
this.totals.sub = sub_total;
this.totals.tax = tax_total;
this.totals.item_discount = line_item_discount_total;
this.totals.item_discount = item_discount_total;
sub_total -= item_discount_total;
// Apply discount to total
if (discount_in_totals) {

29
resources/assets/js/views/sales/invoices.js vendored
View File

@@ -69,9 +69,7 @@ const app = new Vue({
if (typeof invoice_items !== 'undefined' && invoice_items) {
let items = [];
let item_backup = this.form.item_backup[0];
let currency_code = this.form.currency_code;
this.edit.status = true;
invoice_items.forEach(function(item) {
@@ -121,18 +119,18 @@ const app = new Vue({
onCalculateTotal() {
let sub_total = 0;
let discount_total = 0;
let line_item_discount_total = 0;
let item_discount_total = 0;
let tax_total = 0;
let grand_total = 0;
let items = this.form.items;
let discount_in_totals = this.form.discount;
let discount = '';
if (items.length) {
let index = 0;
// get all items.
for (index = 0; index < items.length; index++) {
let discount = 0;
// get row item and set item variable.
let item = items[index];
@@ -140,15 +138,6 @@ const app = new Vue({
let item_total = item.price * item.quantity;
// item discount calculate.
let line_discount_amount = 0;
if (item.discount) {
line_discount_amount = item_total * (item.discount / 100);
item_discounted_total = item_total -= line_discount_amount;
discount = item.discount;
}
let item_discounted_total = item_total;
if (discount_in_totals) {
@@ -156,6 +145,14 @@ const app = new Vue({
discount = discount_in_totals;
}
let discount_amount = 0;
if (item.discount) {
discount_amount = item_total * (item.discount / 100);
item_discounted_total = item_total - discount_amount;
discount = item.discount;
}
// item tax calculate.
let item_tax_total = 0;
@@ -223,7 +220,7 @@ const app = new Vue({
}
// calculate sub, tax, discount all items.
line_item_discount_total += line_discount_amount;
item_discount_total += discount_amount;
sub_total += item_total;
tax_total += item_tax_total;
}
@@ -232,7 +229,9 @@ const app = new Vue({
// set global total variable.
this.totals.sub = sub_total;
this.totals.tax = tax_total;
this.totals.item_discount = line_item_discount_total;
this.totals.item_discount = item_discount_total;
sub_total -= item_discount_total;
// Apply discount to total
if (discount_in_totals) {

4
resources/assets/js/views/wizard/currencies.js vendored
View File

@@ -106,9 +106,5 @@ const app = new Vue({
.catch(error => {
});
},
onSubmit() {
this.form.oldSubmit();
},
}
});

4
resources/assets/js/views/wizard/taxes.js vendored
View File

@@ -78,9 +78,5 @@ const app = new Vue({
this.show = true;
},
onSubmit() {
this.form.oldSubmit();
},
}
});

13
resources/assets/sass/core/mixins/_background-variant.scss vendored
View File

@@ -1,3 +1,16 @@
// Contextual backgrounds
@mixin bg-variant($parent, $color) {
#{$parent} {
background-color: $color !important;
}
a#{$parent},
button#{$parent} {
@include hover-focus {
background-color: darken($color, 10%) !important;
}
}
}
@mixin bg-gradient-variant($parent, $color) {
#{$parent} {
background: linear-gradient(87deg, $color 0, adjust-hue($color, 25%) 100%) !important;

2
resources/assets/sass/core/navbars/_navbar-vertical.scss vendored
View File

@@ -355,9 +355,7 @@
// Sidenav states
.g-sidenav-show {
.sidenav {
.navbar-brand,
.navbar-heading {
display: block;