diff --git a/hesabixCore/src/Controller/TransferController.php b/hesabixCore/src/Controller/TransferController.php
index 4941e75..50ed2bc 100644
--- a/hesabixCore/src/Controller/TransferController.php
+++ b/hesabixCore/src/Controller/TransferController.php
@@ -157,7 +157,6 @@ class TransferController extends AbstractController
throw $this->createNotFoundException('bank not found');
$hesabdariRow->setBank($bank);
$hesabdariRow->setRef($entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '5']));
-
} elseif ($row['type'] == 'salary') {
$salary = $entityManager->getRepository(Salary::class)->findOneBy([
'id' => $row['id'],
@@ -167,7 +166,6 @@ class TransferController extends AbstractController
throw $this->createNotFoundException('salary not found');
$hesabdariRow->setSalary($salary);
$hesabdariRow->setRef($entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '122']));
-
} elseif ($row['type'] == 'cashdesk') {
$cashdesk = $entityManager->getRepository(Cashdesk::class)->findOneBy([
'id' => $row['id'],
@@ -177,7 +175,8 @@ class TransferController extends AbstractController
throw $this->createNotFoundException('cashdesk not found');
$hesabdariRow->setCashdesk($cashdesk);
$hesabdariRow->setRef($entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '121']));
-
+ } elseif ($row['type'] == 'calc') {
+ $hesabdariRow->setRef($entityManager->getRepository(HesabdariTable::class)->findOneBy(['code' => '108']));
}
$entityManager->persist($hesabdariRow);
diff --git a/webUI/src/components/forms/Hnumberinput.vue b/webUI/src/components/forms/Hnumberinput.vue
index 792711d..c2e7086 100644
--- a/webUI/src/components/forms/Hnumberinput.vue
+++ b/webUI/src/components/forms/Hnumberinput.vue
@@ -2,13 +2,14 @@
diff --git a/webUI/src/views/acc/transfer/mod.vue b/webUI/src/views/acc/transfer/mod.vue
index 73b7b39..c50c35e 100644
--- a/webUI/src/views/acc/transfer/mod.vue
+++ b/webUI/src/views/acc/transfer/mod.vue
@@ -14,7 +14,7 @@
cat="transfer">
-
+
@@ -53,12 +53,12 @@
:items="salarys" item-title="name" item-value="id" label="تنخواه گردان" variant="outlined"
:item-props="salaryItemProps">
-
+
-
+
+ variant="outlined" class="mb-4">
@@ -88,13 +88,13 @@
:items="salarys" item-title="name" item-value="id" label="تنخواه گردان" variant="outlined"
:item-props="salaryItemProps">
-
+
-
+ variant="outlined" class="mb-4">
@@ -148,6 +148,7 @@ export default {
year: {},
date: '',
des: '',
+ loading: false,
sideOne: {
type: 'bank',
bank: undefined,
@@ -331,6 +332,7 @@ export default {
return;
}
+ this.loading = true;
let PushData = {
date: this.date,
des: this.des,
@@ -360,18 +362,21 @@ export default {
bd: this.sideOne.tax,
bs: 0,
type: 'calc',
- des: 'کارمزد هزینههای بانکی'
+ des: 'کارمزد هزینههای بانکی',
+ referral: this.sideOne.reference
});
PushData.rows.push({
bs: this.sideOne.tax,
bd: 0,
type: this.sideOne.type,
id: this.sideOne.id,
- des: 'کارمزد هزینههای بانکی'
+ des: 'کارمزد هزینههای بانکی',
+ referral: this.sideOne.reference
});
}
axios.post('/api/transfer/insert', PushData).then((response) => {
+ this.loading = false;
if (response.data.result == '1') {
Swal.fire({
text: 'سند انتقال با موفقیت ثبت شد.',
@@ -388,6 +393,13 @@ export default {
confirmButtonText: 'قبول'
});
}
+ }).catch(() => {
+ this.loading = false;
+ Swal.fire({
+ text: 'خطا در ارتباط با سرور',
+ icon: 'error',
+ confirmButtonText: 'قبول'
+ });
});
},
changeDes(type) {